Received: by mail.netbsd.org (Postfix, from userid 605) id 540A384D42; Tue, 11 Jul 2017 10:52:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D42C184D41 for ; Tue, 11 Jul 2017 10:52:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id qRpOT5wXzncU for ; Tue, 11 Jul 2017 10:52:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 55C7C84CE4 for ; Tue, 11 Jul 2017 10:52:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4C8B0FACB; Tue, 11 Jul 2017 10:52:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1499770361202150" MIME-Version: 1.0 Date: Tue, 11 Jul 2017 10:52:41 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/qt5-qtbase To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20170711105241.4C8B0FACB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1499770361202150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue Jul 11 10:52:41 UTC 2017 Modified Files: pkgsrc/x11/qt5-qtbase: distinfo pkgsrc/x11/qt5-qtbase/patches: patch-qmake_Makefile.unix Log Message: Honor LDFLAGS, fixes RELRO build. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/qt5-qtbase/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1499770361202150 Content-Disposition: inline Content-Length: 3328 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtbase/distinfo diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.32 pkgsrc/x11/qt5-qtbase/distinfo:1.33 --- pkgsrc/x11/qt5-qtbase/distinfo:1.32 Mon Apr 24 12:27:58 2017 +++ pkgsrc/x11/qt5-qtbase/distinfo Tue Jul 11 10:52:41 2017 @@ -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__cma 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 Index: pkgsrc/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix diff -u pkgsrc/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix:1.2 pkgsrc/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix:1.3 --- pkgsrc/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix:1.2 Mon Oct 26 19:03:59 2015 +++ pkgsrc/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix Tue Jul 11 10:52:41 2017 @@ -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 -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 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 --_----------=_1499770361202150--