[yquake2] 10/11: Add patch for CTF to append to CFLAGS, LDFLAGS

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository yquake2.

commit e3f134a5527f10a7828fd866ecc430fecf392a2c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Sep 14 11:57:14 2017 +0100

    Add patch for CTF to append to CFLAGS, LDFLAGS
---
 debian/changelog                                   |  1 +
 ...d-to-CFLAGS-LDFLAGS-instead-of-overriding.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f067d03..707cc9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ yquake2 (7.01+ctf1.05~dfsg-1) UNRELEASED; urgency=medium
   * Rely on Files-Excluded in debian/copyright to repack tarball
   * Add game code for CTF v1.05, which is also GPL (Closes: #872841)
   * Add patch for CTF to use SOURCE_DATE_EPOCH
+  * Add patch for CTF to append to CFLAGS, LDFLAGS
 
  -- Simon McVittie <smcv at debian.org>  Mon, 26 Jun 2017 11:05:54 +0100
 
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
new file mode 100644
index 0000000..5e5dfeb
--- /dev/null
+++ b/debian/patches/ctf-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch
@@ -0,0 +1,37 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 14 Sep 2017 11:56:49 +0100
+Subject: ctf: Append to CFLAGS, LDFLAGS instead of overriding
+
+---
+ ctf/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ctf/Makefile b/ctf/Makefile
+index 83eb806..9e42ab7 100644
+--- a/ctf/Makefile
++++ b/ctf/Makefile
+@@ -50,10 +50,10 @@ endif
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
++CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
+ 		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
+ else
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
++CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
+ 		  -Wall -pipe -g -MMD -fwrapv
+ endif
+ 
+@@ -61,9 +61,9 @@ endif
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch i386 -arch x86_64 
++LDFLAGS += -shared -arch i386 -arch x86_64 
+ else
+-LDFLAGS := -shared
++LDFLAGS += -shared
+ endif
+ 
+ # ----------
diff --git a/debian/patches/series b/debian/patches/series
index ad7e33b..d9b973b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
 Remove-unwanted-rpaths-from-LDFLAGS.patch
 ctf-Use-SOURCE_DATE_EPOCH-for-reproducible-build.patch
+ctf-Append-to-CFLAGS-LDFLAGS-instead-of-overriding.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git