This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository yquake2.
commit 3df3948f122fe3b9242d358a13b50a5df74dfbc5 Author: Simon McVittie <s...@debian.org> Date: Thu Sep 14 20:23:06 2017 +0100 Add CPPFLAGS to CTF CFLAGS --- debian/changelog | 1 + debian/patches/Link-ctf-game.so-to-math-library.patch | 4 ++-- ...f-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch | 15 ++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca72a8b..259374a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ yquake2 (7.01+ctf1.05~dfsg-2) UNRELEASED; urgency=medium * Add patch to link CTF with -lm explicitly, fixing FTBFS + * Add CPPFLAGS to CTF CFLAGS -- Simon McVittie <s...@debian.org> Thu, 14 Sep 2017 20:06:12 +0100 diff --git a/debian/patches/Link-ctf-game.so-to-math-library.patch b/debian/patches/Link-ctf-game.so-to-math-library.patch index 9c7ae5b..9dd62e2 100644 --- a/debian/patches/Link-ctf-game.so-to-math-library.patch +++ b/debian/patches/Link-ctf-game.so-to-math-library.patch @@ -10,10 +10,10 @@ Signed-off-by: Simon McVittie <s...@debian.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctf/Makefile b/ctf/Makefile -index 9e42ab7..4df1c3c 100644 +index f68ebb0..d86de30 100644 --- a/ctf/Makefile +++ b/ctf/Makefile -@@ -185,7 +185,7 @@ release/game.dylib : $(CTF_OBJS) +@@ -186,7 +186,7 @@ release/game.dylib : $(CTF_OBJS) else release/game.so : $(CTF_OBJS) @echo "===> LD $@" diff --git a/debian/patches/ctf-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch b/debian/patches/ctf-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch index 5e5dfeb..be5d8a6 100644 --- a/debian/patches/ctf-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch +++ b/debian/patches/ctf-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch @@ -2,17 +2,22 @@ From: Simon McVittie <s...@debian.org> Date: Thu, 14 Sep 2017 11:56:49 +0100 Subject: ctf: Append to CFLAGS, LDFLAGS instead of overriding +Also add CPPFLAGS. + +Signed-off-by: Simon McVittie <s...@debian.org> --- - ctf/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + ctf/Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ctf/Makefile b/ctf/Makefile -index 83eb806..9e42ab7 100644 +index 83eb806..f68ebb0 100644 --- a/ctf/Makefile +++ b/ctf/Makefile -@@ -50,10 +50,10 @@ endif +@@ -49,11 +49,12 @@ endif + # -fPIC for position independend code. # # -MMD to generate header dependencies. ++CFLAGS += $(CPPFLAGS) ifeq ($(OSTYPE), Darwin) -CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \ @@ -23,7 +28,7 @@ index 83eb806..9e42ab7 100644 -Wall -pipe -g -MMD -fwrapv endif -@@ -61,9 +61,9 @@ endif +@@ -61,9 +62,9 @@ endif # Base LDFLAGS. ifeq ($(OSTYPE), Darwin) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits