diff options
| author | Martchus | 2020-04-04 13:35:53 +0200 |
|---|---|---|
| committer | Martchus | 2020-04-04 13:35:53 +0200 |
| commit | a8990f5c4182e02b451f2d7d1d10cb156263fc48 (patch) | |
| tree | 50e7d49f60d55c0c86943d1a8baed4617680b972 /0018-Merge-shared-and-static-library-trees.patch | |
| parent | 49234a97b387fea7f52f625e7fa56e31ff4aeeef (diff) | |
| download | aur-a8990f5c4182e02b451f2d7d1d10cb156263fc48.tar.gz | |
Update to 5.14.2
Diffstat (limited to '0018-Merge-shared-and-static-library-trees.patch')
| -rw-r--r-- | 0018-Merge-shared-and-static-library-trees.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 8833b9455be1..df15800f6263 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 6b5826e9aa80d2daa13cf1e20c01186145a73841 Mon Sep 17 00:00:00 2001 +From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/31] Merge shared and static library trees @@ -48,7 +48,7 @@ index 81c84b28ef..910e59188f 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 0e41b825ec..4c4b6dd12a 100644 +index 1d79f5c958..48f6e710b6 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.25.1 +2.26.0 |