From unknown Mon Apr 27 19:02:13 2026 X-Loop: git-admin@x2go.org Subject: Bug#84: DESTDIR and OPTFLAGS patches for nx-libs Reply-To: Mike Gabriel , 84@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: git-admin@x2go.org Resent-Date: Wed, 12 Dec 2012 12:03:38 +0000 Resent-Message-ID: Resent-Sender: git-admin@x2go.org X-X2Go-PR-Message: report 84 X-X2Go-PR-Package: nx-libs X-X2Go-PR-Keywords: Received: via spool by submit@bugs.x2go.org id=B.13553138024561 (code B); Wed, 12 Dec 2012 12:03:38 +0000 Received: (at submit) by bugs.x2go.org; 12 Dec 2012 12:03:22 +0000 Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir (Postfix) with ESMTPS id 4C64A5DA6B for ; Wed, 12 Dec 2012 13:03:22 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 0D1499FE for ; Wed, 12 Dec 2012 13:03:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id E01FA3C037 for ; Wed, 12 Dec 2012 13:03:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QElbMBio4pRY for ; Wed, 12 Dec 2012 13:03:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id BD1853C045 for ; Wed, 12 Dec 2012 13:03:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 9544B3C037 for ; Wed, 12 Dec 2012 13:03:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on grimnir.das-netzwerkteam.de X-Spam-Flag: NO X-Spam-Status: No, hits=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 running as userid= X-Spam-Level: X-Spam-Bayes-Score: 0.0000 Received: by grimnir.das-netzwerkteam.de (Postfix, from userid 33) id AEECC3BA4C; Wed, 12 Dec 2012 13:03:20 +0100 (CET) Received: from 195.244.234.222 ([195.244.234.222]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Wed, 12 Dec 2012 13:03:20 +0100 Message-ID: <20121212130320.10874vi4bmd2470o@mail.das-netzwerkteam.de> X-Priority: 3 (Normal) Date: Wed, 12 Dec 2012 13:03:20 +0100 From: Mike Gabriel To: submit@bugs.x2go.org Cc: Orion Poplawski MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=_4svmgxfdbafc"; protocol="application/pgp-signature"; micalg="pgp-sha1" Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.3.4) This message is in MIME format and has been PGP signed. --=_4svmgxfdbafc Content-Type: multipart/mixed; boundary="=_2rhk4ryoyv7s" Content-Transfer-Encoding: 7bit This message is in MIME format. --=_2rhk4ryoyv7s Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit Package: nx-libs Patches attached for nx-libs: - bin/Makefile doesn't support DESTDIR. The attached nx-libs-destdir.patch partially addresses that. - The various nx*/configure.in files do not honor passed in compiler flags. The attached nx-libs-optflags.patch fixes that. Note also though that CFLAGS is used in some and CPPFLAGS in others. ----- Weitergeleitete Nachricht von orion@cora.nwra.com ----- Datum: Tue, 11 Dec 2012 16:11:02 -0700 Von: Orion Poplawski Antwort an: x2go-dev@lists.berlios.de Betreff: [X2Go-Dev] x2go for Fedora packaging issues An: x2go-dev@lists.berlios.de [...] Thank you for your attention. - Orion -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com ----- Ende der weitergeleiteten Nachricht ----- -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb --=_2rhk4ryoyv7s Content-Type: text/x-patch; charset=UTF-8; name="nx-libs-destdir.patch" Content-Disposition: attachment; filename="nx-libs-destdir.patch" Content-Transfer-Encoding: 7bit diff -up nx-libs-3.5.0.16/bin/Makefile.destdir nx-libs-3.5.0.16/bin/Makefile --- nx-libs-3.5.0.16/bin/Makefile.destdir 2012-11-10 06:40:56.000000000 -0700 +++ nx-libs-3.5.0.16/bin/Makefile 2012-12-11 13:32:26.589921544 -0700 @@ -17,13 +17,14 @@ X2GOLIBDIR=$(PREFIX)/lib/x2go echo "Nothing to do for $@..." install: - $(INSTALL_DIR) $(X2GOLIBDIR)/bin/ - ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent - find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done - find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done + $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + ln -sf $(NXLIBDIR)/bin/nxagent $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + [ ! -d $(DESTDIR)$(BINDIR) ] && $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done + find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done uninstall: - find nx* | while read file; do rm -f $(BINDIR)/$$file; done - find x2go* | while read file; do rm -f $(BINDIR)/$$file; done - $(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent - $(RM_DIR) $(X2GOLIBDIR)/bin/ + find nx* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done + find x2go* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done + $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ --=_2rhk4ryoyv7s Content-Type: text/x-patch; charset=UTF-8; name="nx-libs-optflags.patch" Content-Disposition: attachment; filename="nx-libs-optflags.patch" Content-Transfer-Encoding: 7bit diff -up nx-libs-3.5.0.16/nxcomp/configure.in.optflags nx-libs-3.5.0.16/nxcomp/configure.in --- nx-libs-3.5.0.16/nxcomp/configure.in.optflags 2012-11-10 06:40:55.000000000 -0700 +++ nx-libs-3.5.0.16/nxcomp/configure.in 2012-12-11 13:13:19.390229196 -0700 @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Set our default compilation flags. -CXXFLAGS="-O3 -fno-rtti -fno-exceptions" -CFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" +CFLAGS="$CFLAGS -O3" dnl Reset default linking directives. diff -up nx-libs-3.5.0.16/nxcompext/configure.in.optflags nx-libs-3.5.0.16/nxcompext/configure.in --- nx-libs-3.5.0.16/nxcompext/configure.in.optflags 2012-11-10 06:40:55.000000000 -0700 +++ nx-libs-3.5.0.16/nxcompext/configure.in 2012-12-11 13:15:26.712576302 -0700 @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CFLAGS="$CFLAGS -O3" dnl Reset default linking directives. diff -up nx-libs-3.5.0.16/nxcompshad/configure.in.optflags nx-libs-3.5.0.16/nxcompshad/configure.in --- nx-libs-3.5.0.16/nxcompshad/configure.in.optflags 2012-11-10 06:40:56.000000000 -0700 +++ nx-libs-3.5.0.16/nxcompshad/configure.in 2012-12-11 13:13:25.915196300 -0700 @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CPPFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CPPFLAGS="$CPPFLAGS -O3" dnl Reset default linking directives. diff -up nx-libs-3.5.0.16/nxproxy/configure.in.optflags nx-libs-3.5.0.16/nxproxy/configure.in --- nx-libs-3.5.0.16/nxproxy/configure.in.optflags 2012-11-10 06:40:55.000000000 -0700 +++ nx-libs-3.5.0.16/nxproxy/configure.in 2012-12-11 13:16:19.955301045 -0700 @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CPPFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CPPFLAGS="$CPPFLAGS -O3" dnl Prefer headers and libraries from nx-X11 if present. diff -up nx-libs-3.5.0.16/nx-X11/programs/xterm/configure.optflags nx-libs-3.5.0.16/nx-X11/programs/xterm/configure --=_2rhk4ryoyv7s-- --=_4svmgxfdbafc Content-Type: application/pgp-signature Content-Description: Digitale PGP-Unterschrift Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJQyHKIAAoJEJr0azAldxsxb78P/3wqb9hJETrF+EjywQdU3fhb J9bgIKCslBa7pVIrSrPbPQ1YRjGuzGa5LOUS3iK2c55sKqFJjfbva31ytAoET3xz Mbae9cZAE/Jp8tvP2BP1o/ubpDtAgYcOWgQ0nV8KwMIZCbMdb/X9Hgy47TxR77Tp /0T1mtpEUkH5llmhR57UqTds5TSqmzL4rtOUBaMlB573/UurjnSanwZULORcJSha xZJLolMhuXvyXN+sTUY+pi1t5//a/LhAMull/UawFkUL3UZYelvSdMFh63Xy0o/3 LG92RY/3j/nNmtmVxID4Xwv7pYwPX80TnMB2OihZ738k1vBxaRQpIg0GQir3MJJJ VIP4ZEwLN569qT1kWkiuL+zI0bCYzlCn3YBnMb3ua4uGGOwwWJMxtPxmtYn3zukn gdRiJrVs+Qvk9f4Ste/lO3Xz5+7PhdZcV7HUKZ28lD8seZpoCYSYl/FKatyL6hB7 SHOq/EV1Q7FZDorQD2r+PRBEtFQr5FoPtODxV8kdqHbUvSAiAVOKY27rW0avNp3u 9cy2GtSErcRcIIOxwEPCNHYK01dgOixaw9g9pViTCjtHzrZm8bGBxfkJVI7cna5R fEbaOMCb8LV3zSS1TmfrCZz2OgzFxJYaZuPBON9G2qnl0zko5Hw0o5p/AYi/NzxX Pcr5lzxDL02/imSpNFv9 =Izeg -----END PGP SIGNATURE----- --=_4svmgxfdbafc--