File 0001-Generate-import-libraries-with-dll.a-postf... of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Generate-import-libraries-with-dll.a-postfix.patch of Package mingw32-libqt5-qtbase (Revision 4f12472f9e923c6b48335f6dfb1a8845)

Currently displaying revision 4f12472f9e923c6b48335f6dfb1a8845 , Show latest

From 69cedd5473e85b301e1500ec8883b8cd0e6dcad6 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 19 Jul 2017 19:20:56 +0200
Subject: [PATCH] Generate import libraries with dll.a postfix

Change-Id: I10d7f6377a0603da4c8f9211fc3e386229a9a5a7
---
 mkspecs/cygwin-g++/qmake.conf          | 1 +
 mkspecs/features/create_cmake.prf      | 4 ++--
 mkspecs/win32-g++/qmake.conf           | 1 +
 qmake/generators/win32/winmakefile.cpp | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index a4f64d9c66..e0c1953460 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -66,6 +66,8 @@ QMAKE_PREFIX_SHLIB      = lib
 QMAKE_EXTENSION_SHLIB   = dll
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
+QMAKE_PREFIX_IMPLIB  = lib
+QMAKE_EXTENSION_IMPLIB  = dll.a
 
 QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index bb5083c925..44d98c05cd 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -236,8 +236,8 @@ mac {
             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
             CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
         } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
-            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
+            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.dll.a
+            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.dll.a
         }
     } else {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index 6105033..5e3bf85 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -58,6 +58,8 @@ QMAKE_PREFIX_SHLIB      =
 QMAKE_EXTENSION_SHLIB   = dll
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
+QMAKE_PREFIX_IMPLIB  = lib
+QMAKE_EXTENSION_IMPLIB  = dll.a
 QMAKE_LIB_EXTENSIONS    = a dll.a
 
 QMAKE_LIBS              =
 --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 75bb5d236d..23cc4e8296 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -236,7 +236,7 @@ void Win32MakefileGenerator::fixTargetExt()
     } else if (project->isActiveConfig("shared")) {
         project->values("LIB_TARGET").prepend(project->first("QMAKE_PREFIX_STATICLIB")
                                               + project->first("TARGET") + project->first("TARGET_VERSION_EXT")
-                                              + '.' + project->first("QMAKE_EXTENSION_STATICLIB"));
+                                              + '.' + project->first("QMAKE_EXTENSION_IMPLIB"));
         project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
-- 
2.12.3

Places

File 0001-Generate-import-libraries-with-dll.a-postfix.patch of Package mingw32-libqt5-qtbase (Revision 4f12472f9e923c6b48335f6dfb1a8845)

Places