From patchwork Fri Feb 16 21:21:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 7615 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp1180449jai; Fri, 16 Feb 2018 13:21:14 -0800 (PST) X-Google-Smtp-Source: AH8x226UHi/FxYjg5QSii0Wr4o63p9xZHhDv5l+iHBMiZp9srUpEkz1T1UBXON31TxQ1i9e3Jk2X X-Received: by 10.28.74.217 with SMTP id n86mr5999303wmi.93.1518816074342; Fri, 16 Feb 2018 13:21:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518816074; cv=none; d=google.com; s=arc-20160816; b=Nbu5pNUwk4r8kPErLULpAt8GOeBz7N5JYi/XqSQgNXrKniHFF8iGHJ2miSUskVwFti FTyxf8Rfk4su5DBtBsqku+xuas1FnmICYPdPU9sh7evhr9q3yJ4w+1a2dDHACiHAR8tL VDfvESwqCrz3BvUUPmqshWJp6I5OZtG3+2wtgpvCsG5NzVGzHIOafy1rtxKgzEZFw5TQ Iv5FR7rEIX+kYSd9tHW+BC2RWrpr54yK0qZhXIduOmrDrKRhjYt88QGHWcGXwe0CyafD 7kQKFGr1TJRzbNVceZnIPtu9Rf588R5QETSZH0dgdLl0ksepT19FFQOuPimorWbqtC/U 5Dxw== 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=eeXZVJGwqMYRaShrP+Z6m1xc2lPvsc2bFG1Bg5Tzd2I=; b=uj4j/FoprBVmzWaLyosWsCz4AIhULi8SFD+TvN40Lfln3wCkvPkwPfPho/kJvHP/dV RC/0xK4T1bWMLu8VHhs+m0gWKdz8A6iQOl8nzBjj2FyZz5givWfPa+xMEARO+pP8aZfo LTGDOevdttl8dPM0dilcC2XeaZrB5EMMlYJtI0EIe8tnnO9QY6SC9qJhjAREdaybvYwk rDMU9K3lfir6ST4SyCrslvDnXFWFtfTliA0SDkz2k2t4qjjSiRmH7y7vHBsxUiys8llq V8h+zaK+qcGEqm7ytwKdlV4a//96kZt5JXKwDtRqJmxzjlWrQEcEhKxWMA+HUYpsXMN1 Emww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UqkERmDb; 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=QUARANTINE 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 62si10504911wml.166.2018.02.16.13.21.12; Fri, 16 Feb 2018 13:21:14 -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=UqkERmDb; 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=QUARANTINE 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 5069168A242; Fri, 16 Feb 2018 23:20:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E4D868A175 for ; Fri, 16 Feb 2018 23:20:52 +0200 (EET) Received: by mail-wr0-f176.google.com with SMTP id b52so4168095wrd.10 for ; Fri, 16 Feb 2018 13:21:04 -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=yL3PldiuHwY4yBhsnxiIG4v+taPjNQwL5i41tLdwbKo=; b=UqkERmDbdbeL2tWo110cuILTfNIc4L8LTJ4RWPNYXe1PlsLhTlXHfMVWluweCOKEX4 2c5S+xJxwK8ADxlkcYHOb1OqgkJhYhtwAsYOSHYoOOCZEJHTZa1/l1n7ALckJ18IrQ9G qYQ6lA616/ey8FJJBkaPPrPJ/RdnUgLy2GR5pWXdsiYaaOAmKJSqN1w91prfHrPLLuPD GWiEbbbEd8D/sIRWNsZrrOtpCUmAaa5lj9qmmIhl5W/SDURKaQryPt9dWUUhlo6nuXXj wrN1lAIhtEsBq3R9bvAVNPqlWtSuRixOjI2/MKNqers9Y7TCaQkumJShlMt+9/ejgmkE MyOw== 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=yL3PldiuHwY4yBhsnxiIG4v+taPjNQwL5i41tLdwbKo=; b=RPm16t7AqRfrnul7d45NiBx/WIHh3rfR2rYi5DkpHQD7aImPQQYAiy9b81PHBSXFkR E9WKVOSCB107wZeFZNKd+OCHRsgRVH5Vrg2NsFzCVk/M3pEHIwnhGRSOzGKou1pEguC9 +K6MFGT/JKBseZP8/8tgB+s76vmAz7rPyj7N7EEGGVHaUYKaDDp4GGfVCV+WxLd3jN5L MAgYbl2s0mihyuAjzE0kctcoIX6r0HgXCqXlnAkCTqhzZp2vHvUlwHFY4n/NIfMJMUi/ QbV/AhMyz/aRplKK/gq4PZL0UzUeHnfb06MTXC6349NAFrRoW8bZhgOgPsopeacZyyQF G0bQ== X-Gm-Message-State: APf1xPBXWBJoaC5hWs9qegz+Zmt51LgNXUeJxY30Vz2BFq/D8OBmelqH AAW7bGXnGtypUT+effab/tArZeB+ X-Received: by 10.223.157.135 with SMTP id p7mr6736090wre.33.1518816064110; Fri, 16 Feb 2018 13:21:04 -0800 (PST) Received: from localhost (p4FC4F40D.dip0.t-ipconnect.de. [79.196.244.13]) by smtp.gmail.com with ESMTPSA id h200sm14026655wme.11.2018.02.16.13.21.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 13:21:03 -0800 (PST) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Feb 2018 22:21:03 +0100 Message-Id: <20180216212103.21036-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.16.1.windows.4 Subject: [FFmpeg-devel] [PATCH] build: restore using dlltool/lib.exe for creating Win32 .lib files 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" The GCC generated import libraries don't work properly when being imported by MSVC, resulting in missing symbols at runtime. This reverts 5b5365fe9 and partially reverts changes from 98a9b1f0d --- configure | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 99c53d482a..3b06b86a6e 100755 --- a/configure +++ b/configure @@ -4994,6 +4994,10 @@ case $target_os in ;; mingw32*|mingw64*) target_os=mingw32 + LIBTARGET=i386 + if enabled x86_64; then + LIBTARGET="i386:x86-64" + fi if enabled shared; then # Cannot build both shared and static libs when using dllimport. disable static @@ -5005,7 +5009,14 @@ case $target_os in SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' - SLIB_EXTRA_CMD='cp $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' + if check_cmd lib.exe -list; then + SLIB_EXTRA_CMD=-'lib.exe -nologo -machine:$(LIBTARGET) -def:$$(@:$(SLIBSUF)=.def) -out:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' + if enabled x86_64; then + LIBTARGET=x64 + fi + else + SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)' + fi SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' @@ -5013,6 +5024,7 @@ case $target_os in SLIB_CREATE_DEF_CMD='EXTERN_PREFIX="$(EXTERN_PREFIX)" 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" + dlltool="${cross_prefix}dlltool" ranlib=: enable dos_paths check_ldflags -Wl,--nxcompat,--dynamicbase @@ -6886,6 +6898,7 @@ LD_O=$LD_O X86ASM_O=$X86ASM_O LD_LIB=$LD_LIB LD_PATH=$LD_PATH +DLLTOOL=$dlltool WINDRES=$windres DEPWINDRES=$dep_cc DOXYGEN=$doxygen @@ -6939,6 +6952,7 @@ LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD EXTRALIBS=$extralibs COMPAT_OBJS=$compat_objs INSTALL=$install +LIBTARGET=${LIBTARGET} SLIBNAME=${SLIBNAME} SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION} SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}