diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:26:38 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:27:39 +0000 |
| commit | dc043a0252c0eb8041b032d88b6f28c9c74a1a7a (patch) | |
| tree | 4b2cba000a4976a865eacfaf000bac700f8eb87c /testing/qt5-qtwebkit/fix-rpath.patch | |
| parent | 74532119b8110896689d2eeb270c620a89b01f59 (diff) | |
| download | aports-dc043a0252c0eb8041b032d88b6f28c9c74a1a7a.tar.bz2 aports-dc043a0252c0eb8041b032d88b6f28c9c74a1a7a.tar.xz | |
testing/qt5-*: upgrade to 5.2.1, fix musl build
Diffstat (limited to 'testing/qt5-qtwebkit/fix-rpath.patch')
| -rw-r--r-- | testing/qt5-qtwebkit/fix-rpath.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testing/qt5-qtwebkit/fix-rpath.patch b/testing/qt5-qtwebkit/fix-rpath.patch index b032e90c45..d365b87754 100644 --- a/testing/qt5-qtwebkit/fix-rpath.patch +++ b/testing/qt5-qtwebkit/fix-rpath.patch @@ -1,11 +1,11 @@ ---- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig 2013-10-10 13:50:38.663745911 +0000 -+++ ./Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-10 13:50:53.253909607 +0000 -@@ -32,8 +32,6 @@ +--- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig ++++ ./Tools/qmake/mkspecs/features/unix/default_post.prf +@@ -58,8 +58,6 @@ QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions } -contains(TEMPLATE, app): CONFIG += rpath - - isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. - config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory + CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { + # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. + !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory |