This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 4dcd746 Makefile: reset to the original state and make sure that we don't pass CXXFLAGS on to the actual build process to not override the values generated by qmake. new 0cda237 Makefile: the only way to prevent variables on the command line to be passed down seems to be to remove them from MAKEOVERRIDES. The 1 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: Makefile | 7 +++++-- debian/changelog | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 0cda2374802604b9865078fb3dc7667d1c6fcc97 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 11:09:55 2017 +0200 Makefile: the only way to prevent variables on the command line to be passed down seems to be to remove them from MAKEOVERRIDES. .MAKEOVERRIDES is the FreeBSD-make-equivalent variable. MAKEFLAGS has no effect on this behavior, so removing it again. --- Makefile | 7 +++++-- debian/changelog | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3f47353..8805d05 100755 --- a/Makefile +++ b/Makefile @@ -32,6 +32,9 @@ LDFLAGS+=-lldap -lcups -lX11 -lXpm all: build +MAKEOVERRIDES= +.MAKEOVERRIDES= + build: build_man build_pluginprovider $(MAKE) build_client $(MAKE) build_plugin @@ -39,12 +42,12 @@ build: build_man build_pluginprovider build_client: $(LRELEASE_BINARY) x2goclient.pro mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro - cd $(CLIENT_DIR) && $(MAKE) MAKEFLAGS= + cd $(CLIENT_DIR) && $(MAKE) build_plugin: $(LRELEASE_BINARY) x2goclient.pro mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro - cd $(PLUGIN_DIR) && $(MAKE) MAKEFLAGS= + cd $(PLUGIN_DIR) && $(MAKE) build_pluginprovider: diff --git a/debian/changelog b/debian/changelog index aad2c09..c034cbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -176,6 +176,10 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - Makefile: reset to the original state and make sure that we don't pass CXXFLAGS on to the actual build process to not override the values generated by qmake. + - Makefile: the only way to prevent variables on the command line to be + passed down seems to be to remove them from MAKEOVERRIDES. + .MAKEOVERRIDES is the FreeBSD-make-equivalent variable. MAKEFLAGS has no + effect on this behavior, so removing it again. * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org