From patchwork Thu Nov 16 02:09:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6113 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5294729jah; Wed, 15 Nov 2017 18:10:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMYv+DHOywW90onguTP1Pa/Ndp6hBlfQJAOxigcenwgmWzRXf0teql17rNpmsBb6ZPIE9Z1g X-Received: by 10.223.157.11 with SMTP id k11mr49749wre.281.1510798219962; Wed, 15 Nov 2017 18:10:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510798219; cv=none; d=google.com; s=arc-20160816; b=R6XMJCQM8Aq/Gkzqrpo5R/kdjl2q6mNfsq7WJONpJXrxjdF7qyiv9Rc3enB1Jg4l6Y erTCuoL2bgoImERCRqaryOIJ3+iA7s6+xA3ero45VaimLPP8HvlZrNkTSaG6mMT3BI8M WoDNKtoPLx2iGxb7x94YAIw3zUpbR0DoKW9xZFy+dwosih0RizccnwaRlZu0Jh+tcgwK dx3epuPuwXg+tytsaM4i2DRZrNaRL9jP8iY4cAsp5g2uru/1h2U8dn4uLC5mwEqEK6nD TrAmbRfA+5y2n9Do9HRfdge64VKpbvoY6mQhiHr7j0Qd3uqCQr3pdhq8ZgnW7cypi6dm 9f2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=GVPRqDHhUhYNQaojYpPzKivFEj4BPErVtvSC5NjQowY=; b=juVFcrDY0OusLnPR9OXy6Vf5Ub2GdTGefQP38deLzQtOzr+vzUEyfl3auF+QzhmenR lRtGjG76EeonFr/Z62hCjYgJb9PKNqpaZtooLROl31i9Jzwy2KUkyEIr9473yzskipoN S+Tw7ktkNGc2tZLRxn4JuUsq96h3EfFmEMFm5B/7eWTyFeoLqh6YErtBUZ4lkRJyJM4k etujXxM/mmPElzTBSMCP1EkMtF3F/IjWcW4S0sMwMMvjkjmcNW0oIOeiFZtB2OVqpjtX Tl0yJZVLqKljebLhz8VZ6Td2mjlKwUx1hbjiolgy17ADcK48LzDLwmCEMIdiOAaBvo7u KLHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=q71Dc2lW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t143si213782wmt.72.2017.11.15.18.10.19; Wed, 15 Nov 2017 18:10:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=q71Dc2lW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A633268A1B9; Thu, 16 Nov 2017 04:10:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC13D68A171 for ; Thu, 16 Nov 2017 04:09:55 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id u42so16240926qte.7 for ; Wed, 15 Nov 2017 18:10:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ZQUmrMKU1fM/3GBwNIfHvPl2YIOLBEVsr6IkyuDHjZo=; b=q71Dc2lWXEJmgHVVF96BjnqabkSnyiJlCtka1lo8lf1tkXAkvMg0UEaan/zeRayfDs gGc4/RSSwf77Xrx+2muSTMURPIPSKKIYwVG7qgZ5GVxjIpDFre0xXGLjaexQfGx6coGG NZ/kWLtkJtlpxaU3IU96+HPRzFUzG6Xhh9j4uBXC4Aiz3gojY9Okx1v6Atj9yzWLkXvl qXOcRjHIi0UU0+r3w15z641zTYK4qv5bI7CaPb/zaXdTQ3tZSe3fDcwfuNZZmqlOCSyr n+YVxP1cH2QpxaINFoOMbok1cysFYGhWikP53aZVjEykQFuVN8tXWaF9ma4By6C90Ct5 e1GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ZQUmrMKU1fM/3GBwNIfHvPl2YIOLBEVsr6IkyuDHjZo=; b=d6Zd0ybYIJLKstHwNMQ0IrLvat787DUfL4pO0dfDvF+p0wpRiBqRRVZ00FEGknZznF PNHQnqqz6Q5j75YqfextORv5OQAS95bdzlupwMyBeGoLoRissc1yAZqDhBjBkvCS1rIH fHeuliRcbLRjHb6v/mApOLvMNhWmaxhxmP1oHOkDoGXGuaGFUKa3AlVmxQZmn8qzUuVm 6Iw+cYsEklGzBcpkC5gLEEsbVYSUaOuiI0Nb1gQ16eA7C9IsfGn2yPAe6LXz38/vlhrq 3sFFbyxjJu8lwWUpX5EwgbyYTQDnNfPAF/BEQMzFnebV2H5hAVr36EdVuOP9nyU2qUBL MgFQ== X-Gm-Message-State: AJaThX5znpfAzrH5Qu6BYY2g0D0NjSY2Bj+WoLf43I2vuvj8XzGIN2jk lYVbXJhCCLkqIwHA6BjrzMY2UQ== X-Received: by 10.200.46.119 with SMTP id s52mr166206qta.192.1510798210252; Wed, 15 Nov 2017 18:10:10 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id m22sm9916qtf.85.2017.11.15.18.10.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Nov 2017 18:10:09 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Nov 2017 23:09:39 -0300 Message-Id: <20171116020939.7600-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] configure: use subarch instead of arch to create .def files on mingw X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" arch is "x86" regardless of target being x86_32 or x86_64, and if configuring with asm disabled it's "c" instead. Using subarch (Always either "x86_32" or "x86_64") and adapting makedef makes sure the symbols are always detected correctly on x86_32. --- compat/windows/makedef | 2 +- configure | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compat/windows/makedef b/compat/windows/makedef index 0cd169c15c..9e88611cc8 100755 --- a/compat/windows/makedef +++ b/compat/windows/makedef @@ -63,7 +63,7 @@ IFS=' prefix="" if [ -n "$NM" ]; then case $ARCH in - *86) + x86_32) prefix="_" ;; *) diff --git a/configure b/configure index 934ac3abfd..4e7d7a8545 100755 --- a/configure +++ b/configure @@ -4971,7 +4971,7 @@ case $target_os in SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' - SLIB_CREATE_DEF_CMD='ARCH="$(ARCH)" AR="$(AR_CMD)" NM="$(NM_CMD)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' + SLIB_CREATE_DEF_CMD='ARCH="$(SUBARCH)" AR="$(AR_CMD)" NM="$(NM_CMD)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--disable-auto-image-base $$(@:$(SLIBSUF)=.def)' enabled x86_64 && objformat="win64" || objformat="win32" ranlib=: @@ -6779,6 +6779,7 @@ SRC_PATH:=\$(SRC_PATH:.%=..%) endif CC_IDENT=$cc_ident ARCH=$arch +SUBARCH=$subarch INTRINSICS=$intrinsics CC=$cc CXX=$cxx