diff options
| author | wiz <wiz@pkgsrc.org> | 2017-07-11 10:52:41 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-07-11 10:52:41 +0000 |
| commit | de47094113d1c39bf28bdb029989cfbf119a2c72 (patch) | |
| tree | d8630f00e7edd3607151148c8d29a7b847b7ecd3 /x11/qt5-qtbase | |
| parent | 0b2bf900f877c0574ac8cca260a661ac71a80582 (diff) | |
| download | pkgsrc-de47094113d1c39bf28bdb029989cfbf119a2c72.tar.gz | |
Honor LDFLAGS, fixes RELRO build.
Diffstat (limited to 'x11/qt5-qtbase')
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-qmake_Makefile.unix | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index 019ee1bb516..442e586831d 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2017/04/24 12:27:58 maya Exp $ +$NetBSD: distinfo,v 1.33 2017/07/11 10:52:41 wiz Exp $ SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 @@ -10,7 +10,7 @@ SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b -SHA1 (patch-qmake_Makefile.unix) = 0b33fc32f493e23da25bfb38ad59a6ae550581e5 +SHA1 (patch-qmake_Makefile.unix) = c14d72bb76d469df3b730a105473b47f3a05850b SHA1 (patch-qmake_generators_makefile.cpp) = 08bdf7b58fb7e5bd2a1c31f0a0344c733b65acb3 SHA1 (patch-qmake_generators_unix_unixmake.cpp) = f8d2b60473b19cfab76cca1b886f71030674099d SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 528d7ea009dd9dd698009d7797d0b23dd469d995 diff --git a/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix index ab06baedb16..c17fd96f9d6 100644 --- a/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix +++ b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix @@ -1,8 +1,8 @@ -$NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $ +$NetBSD: patch-qmake_Makefile.unix,v 1.3 2017/07/11 10:52:41 wiz Exp $ * Pass environmental variables from pkgsrc ---- qmake/Makefile.unix.orig 2015-06-29 20:03:23.000000000 +0000 +--- qmake/Makefile.unix.orig 2015-10-13 04:35:09.000000000 +0000 +++ qmake/Makefile.unix @@ -74,6 +74,7 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \ @@ -21,7 +21,7 @@ $NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $ -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ -I$(INC_PATH) -I$(INC_PATH)/QtCore \ -@@ -106,7 +107,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ +@@ -106,13 +107,13 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS @@ -30,6 +30,13 @@ $NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $ first all: $(BUILD_PATH)/bin/qmake$(EXEEXT) qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT) + + $(BUILD_PATH)/bin/qmake$(EXEEXT): $(OBJS) $(QOBJS) +- $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) ++ $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) $(LDFLAGS) + + Makefile: $(SOURCE_PATH)/qmake/Makefile.unix + @echo "Out of date, please rerun configure" @@ -284,6 +285,9 @@ qstring.o: $(SOURCE_PATH)/src/corelib/to qstring_compat.o: $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp |