diff options
| author | nros <nros@pkgsrc.org> | 2015-05-18 14:02:02 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2015-05-18 14:02:02 +0000 |
| commit | 388f6ecf432eaf67d45dc26e5f7404191afe89b8 (patch) | |
| tree | a5655c9a49833671f26b9b3ef306e66f928347d5 | |
| parent | 394054b0d074a448049fa380231900142fa7e340 (diff) | |
| download | pkgsrc-388f6ecf432eaf67d45dc26e5f7404191afe89b8.tar.gz | |
Add patch so that -fPIE is not used when building shared libraries that
uses Qt5 with cmake.
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index e4102352f52..eacd1505b6d 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2015/05/18 13:52:24 nros Exp $ +$NetBSD: distinfo,v 1.22 2015/05/18 14:02:02 nros Exp $ SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 @@ -13,6 +13,7 @@ SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59 SHA1 (patch-qmake_generators_unix_unixmake.cpp) = b278ab55b2a8083d5bd343d9e748790cf99dc4e6 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 7c2966006f20390c5b40698f1a110debd0b88c3a SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = abdb069ef9b77ced3c18a9cc9c18bcdfeda02ce8 +SHA1 (patch-src_corelib_Qt5CoreConfigExtras.cmake.in) = fb0b7d4ec108e668ec4fc583489728d6af91e170 SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101 SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180 diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in b/x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in new file mode 100644 index 00000000000..4025ff5a9b0 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in @@ -0,0 +1,16 @@ +$NetBSD: patch-src_corelib_Qt5CoreConfigExtras.cmake.in,v 1.1 2015/05/18 14:02:02 nros Exp $ +Then PIE is set cmake sometimes builds object files that are to be used +in shared objects with PIE when is supposed to use only PIC. +This patch exists in qt5 5.5. +http://code.qt.io/cgit/qt/qtbasegit/log/src/corelib/Qt5CoreConfigExtras.cmake.in +--- src/corelib/Qt5CoreConfigExtras.cmake.in.orig 2015-05-12 21:00:11.000000000 +0000 ++++ src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -72,7 +72,7 @@ set(_qt5_corelib_extra_includes) + # macro to add it. + set(Qt5_POSITION_INDEPENDENT_CODE True) + set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\") +-set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\") ++set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIC\") + !!ENDIF + + !!IF !isEmpty(QT_NAMESPACE) |