File 0001-Fix-duplicated-prefix-for-libEGL-and-libGL... of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-duplicated-prefix-for-libEGL-and-libGLESv2.patch of Package mingw32-libqt5-qtbase (Revision 96fdf584bbfba92b7e42b8714b7023ab)

Currently displaying revision 96fdf584bbfba92b7e42b8714b7023ab , Show latest

From b3317f5d7eedc1971bfb8a6b273cea78a3e4e0b1 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 29 May 2024 09:59:36 +0200
Subject: [PATCH] Fix duplicated prefix for libEGL and libGLESv2

---
 mkspecs/features/qt_helper_lib.prf | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf
index 2d67a30fb..f0a34ac63 100644
--- a/mkspecs/features/qt_helper_lib.prf
+++ b/mkspecs/features/qt_helper_lib.prf
@@ -33,14 +33,22 @@ MODULE = $$replace(TARGET, ^qt, )
 MODULE ~= s,-,_,
 MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_ext_$${MODULE}.pri
 ucmodule = $$upper($$MODULE)
-win32|CONFIG(static, static|shared) {
+CONFIG(static, static|shared) {
     prefix = $$QMAKE_PREFIX_STATICLIB
     suffix = $$QMAKE_EXTENSION_STATICLIB
+    _target = $$TARGET
 } else {
-    prefix = $$QMAKE_PREFIX_SHLIB
-    suffix = $$QMAKE_EXTENSION_SHLIB
+    win32 {
+        prefix = $$QMAKE_PREFIX_IMPLIB
+        suffix = $$QMAKE_EXTENSION_IMPLIB
+        # fix duplicated prefix for libEGL and libGLESv2
+        _target = $$replace(TARGET, ^lib, )
+    } else {
+        prefix = $$QMAKE_PREFIX_SHLIB
+        suffix = $$QMAKE_EXTENSION_SHLIB
+        _target = $$TARGET
+    }
 }
-
 !build_pass {
     CC_USES =
     LD_USES =
@@ -62,12 +70,12 @@ win32|CONFIG(static, static|shared) {
         MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} ="
     } else: if(msvc|qtConfig(debug_and_release)): {
         win32: \
-            MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix
+            MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${_target}d.$$suffix
         else: darwin: \
-            MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}_debug.$$suffix
+            MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${_target}_debug.$$suffix
         else: \
             error("'$$QMAKE_PLATFORM' does not do debug_and_release.")
-        MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix
+        MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${_target}.$$suffix
         MODULE_PRI_CONT += \
             "QMAKE_LIBS_$${ucmodule} =" \  # Needed for the module to be recognized.
             "QMAKE_LIBS_$${ucmodule}_DEBUG = $$val_escape(MODULE_DEBUG_LIBS)" \
-- 
2.44.0

Places

File 0001-Fix-duplicated-prefix-for-libEGL-and-libGLESv2.patch of Package mingw32-libqt5-qtbase (Revision 96fdf584bbfba92b7e42b8714b7023ab)

Places