[med-svn] [libzstd] 04/05: Append to CFLAGS, reinstate section:libs

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository libzstd.

commit 168f5062ee28fcccb35e8516097e343c28f52255
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Tue Dec 22 12:38:24 2015 +1100

    Append to CFLAGS, reinstate section:libs
---
 debian/control                                     |  1 +
 .../0005-Append-to-CPPFLAGS-don-t-overwrite.patch  | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/control b/debian/control
index 760b1c8..682aee5 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Description: fast lossless compression algorithm -- development files
 
 Package: libzstd0
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Description: fast lossless compression algorithm
diff --git a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
new file mode 100644
index 0000000..b8aeccb
--- /dev/null
+++ b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
@@ -0,0 +1,39 @@
+From: Kevin Murray <spam at kdmurray.id.au>
+Date: Tue, 22 Dec 2015 12:31:33 +1100
+Subject: Append to CPPFLAGS, don't overwrite
+
+---
+ lib/Makefile      | 4 ++--
+ programs/Makefile | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index fc05f1a..b45b68e 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -40,8 +40,8 @@ VERSION?= $(LIBVER)
+ 
+ DESTDIR?=
+ PREFIX ?= /usr
+-CPPFLAGS= -I. -I./legacy -DZSTD_LEGACY_SUPPORT=1
+-CFLAGS ?= -O3
++CPPFLAGS += -I. -I./legacy -DZSTD_LEGACY_SUPPORT=1
++CFLAGS += -O3
+ CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
+ FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
+ 
+diff --git a/programs/Makefile b/programs/Makefile
+index 1eadb98..b4bc672 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -34,8 +34,8 @@ VERSION?= 0.4.0
+ 
+ DESTDIR?=
+ PREFIX ?= /usr
+-CPPFLAGS= -I../lib -DZSTD_VERSION=\"$(VERSION)\"
+-CFLAGS ?= -O3  # -falign-loops=32   # not always beneficial
++CPPFLAGS += -I../lib -DZSTD_VERSION=\"$(VERSION)\"
++CFLAGS += -O3  # -falign-loops=32   # not always beneficial
+ CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
+ FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b333240..90eb33e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Build-lib-by-default.patch
 0003-Use-prefix-of-usr-not-usr-local.patch
 0004-Add-symlinks-for-extra-manpages.patch
+0005-Append-to-CPPFLAGS-don-t-overwrite.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git