This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goadmincenter. from 77f1387 Update Estonian translation files. new b9f2836 x2goadmincenter/Makefile: add QMAKE_OPTS variable to be able to pass additional arguments to qmake. new bf3346d x2goadmincenter/Makefile: make sure we don't pass random variables down to sub make calls. new 1468fff x2goadmincenter.spec: honor %{optflags} for CXXFLAGS and don't strip binaries. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++++++ x2goadmincenter.spec | 2 +- x2goadmincenter/Makefile | 39 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goadmincenter.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit b9f2836244ff0d911876bb4fdb55d5cf1a0943b5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 13:58:21 2017 +0200 x2goadmincenter/Makefile: add QMAKE_OPTS variable to be able to pass additional arguments to qmake. --- debian/changelog | 2 ++ x2goadmincenter/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a68cdb9..ac24ac2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low [ Mihai Moldovan ] * Upstream version 0.0.0.1 (initial release): - Change string "X2go" to "X2Go" where appropriate. + - x2goadmincenter/Makefile: add QMAKE_OPTS variable to be able to pass + additional arguments to qmake. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index bd3464b..6bd99c7 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -22,6 +22,7 @@ MANDIR=$(SHAREDIR)/man LIBDIR=$(PREFIX)/lib/x2goadmincenter QMAKE_BINARY=qmake-qt4 LRELEASE_BINARY=lrelease-qt4 +QMAKE_OPTS= all: build @@ -33,11 +34,11 @@ build-indep: build_man build_admincenter: $(LRELEASE_BINARY) x2goadmincenter.pro - mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goadmincenter.pro + mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ${QMAKE_OPTS} ../x2goadmincenter.pro cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $$module.pro && make && cd - 1>/dev/null; done + for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ${QMAKE_OPTS} $$module.pro && make && cd - 1>/dev/null; done build_man: $(MAKE) -f Makefile.man2html build -- Alioth's /srv/git/code.x2go.org/x2goadmincenter.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit 1468fff00a5edee643c5e8a3c6069da56e508115 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 14:01:57 2017 +0200 x2goadmincenter.spec: honor %{optflags} for CXXFLAGS and don't strip binaries. Backported from X2Go Client. --- debian/changelog | 3 +++ x2goadmincenter.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3414e6e..763c85a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,5 +83,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed versioning. + * x2goadmincenter.spec: + - Honor %{optflags} for CXXFLAGS and don't strip binaries. Backported from + X2Go Client. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 21 Sep 2011 21:12:56 +0200 diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index a33b84d..77ff25f 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -101,7 +101,7 @@ sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' x2goa sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_bindir}/qmake@' x2goadmincenter/Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_bindir}/lrelease@' x2goadmincenter/Makefile %endif -make %{?_smp_mflags} +make %{?_smp_mflags} CXXFLAGS="%{optflags}" QMAKE_OPTS="QMAKE_STRIP=:" %install -- Alioth's /srv/git/code.x2go.org/x2goadmincenter.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit bf3346d50af044646f47b12053c1b849c64fe16a Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 14:01:00 2017 +0200 x2goadmincenter/Makefile: make sure we don't pass random variables down to sub make calls. Backported from X2Go Client. --- debian/changelog | 2 ++ x2goadmincenter/Makefile | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac24ac2..3414e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -77,6 +77,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low - Change string "X2go" to "X2Go" where appropriate. - x2goadmincenter/Makefile: add QMAKE_OPTS variable to be able to pass additional arguments to qmake. + - x2goadmincenter/Makefile: make sure we don't pass random variables down + to sub make calls. Backported from X2Go Client. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 6bd99c7..0a9fb30 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -24,6 +24,40 @@ QMAKE_BINARY=qmake-qt4 LRELEASE_BINARY=lrelease-qt4 QMAKE_OPTS= + +##################################################################### +# Make sure that variables passed via the command line are not +# automatically exported. +# +# By default, such variables are exported and passed on to child +# (make) processes, which means that we will run into trouble if we +# pass CXXFLAGS="some value" as an argument to the top-level +# make call. Whatever qmake generates will be overridden by this +# definition, leading to build failures (since the code expects +# macro values to be set in some cases - which won't be the case +# for "generic" CXXFLAGS values.) +# +# Doing that turns out to be somewhat difficult, though. +# +# While preventing make from passing down *options* is possible via +# giving the new make call an empty MAKEFLAGS value and even though +# variables defined on the command line are part of MAKEFLAGS, this +# doesn't affect implicit exporting of variables (for most +# implementations.) +# +# Even worse, the correct way to this stuff differs from make +# implementation to make implementation. + +# GNU make way. +MAKEOVERRIDES= + +# FreeBSD and NetBSD way. +.MAKEOVERRIDES= + +# OpenBSD way. +.MAKEFLAGS= + + all: build build: build-arch build-indep -- Alioth's /srv/git/code.x2go.org/x2goadmincenter.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
-
git-admin＠x2go.org