diff options
author | Michel Zou | 2019-02-22 18:26:23 +0100 |
---|---|---|
committer | Michel Zou | 2019-02-22 18:26:23 +0100 |
commit | ea2da1870c5d80e4c77364d198aa1fad64b8c4f0 (patch) | |
tree | 09c9102d7a602ff0d04c165cec8ece1e216705cc /0021-Merge-shared-and-static-library-trees.patch | |
parent | 12107bedc14b62761fd2de498659c6b19768d59c (diff) | |
download | aur-ea2da1870c5d80e4c77364d198aa1fad64b8c4f0.tar.gz |
5.12.1
Diffstat (limited to '0021-Merge-shared-and-static-library-trees.patch')
-rw-r--r-- | 0021-Merge-shared-and-static-library-trees.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch index 2098ed9f1ce2..142e2cebba30 100644 --- a/0021-Merge-shared-and-static-library-trees.patch +++ b/0021-Merge-shared-and-static-library-trees.patch @@ -1,7 +1,7 @@ -From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001 +From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 -Subject: [PATCH 21/33] Merge shared and static library trees +Subject: [PATCH 21/34] Merge shared and static library trees Allow installation of shared and static build in the same prefix --- @@ -13,7 +13,7 @@ Allow installation of shared and static build in the same prefix 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/configure.pri b/configure.pri -index 64ed6b9ed8..2cc54d15a2 100644 +index b3b3e27c44..3136889a2f 100644 --- a/configure.pri +++ b/configure.pri @@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) { @@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index d16b3cf1be..2c4d6cd97e 100644 +index 5da82fdb5b..5b05aa9e2a 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -268,6 +268,23 @@ for(ever) { +@@ -246,6 +246,23 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index a7f1285c26..879410afef 100644 +index e640fb8079..fc7f729ae6 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index a7f1285c26..879410afef 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index a7f1285c26..879410afef 100644 t << endl; -- -2.19.2 +2.20.1 |