[SCM] liblivemedia/master: Also pass CPPFLAGS while linking

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c4b3bb156bb2e9e3d8128c0b51fa2ebc6215b1d3
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Sep 17 11:37:18 2017 +0200

    Also pass CPPFLAGS while linking

diff --git a/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch b/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
index 788e76e..52edce0 100644
--- a/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
+++ b/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
@@ -4,8 +4,8 @@ Subject: Link shared libraries with g++ instead of gcc to fix build failure
 
 ---
  config.linux                       | 6 +++---
- config.linux-with-shared-libraries | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ config.linux-with-shared-libraries | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/config.linux b/config.linux
 index d0ec446..87cd0e6 100644
@@ -28,12 +28,15 @@ index d0ec446..87cd0e6 100644
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
  LIBRARY_LINK =		ar cr 
 diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
-index df8a8e0..d428192 100644
+index df8a8e0..612a487 100644
 --- a/config.linux-with-shared-libraries
 +++ b/config.linux-with-shared-libraries
-@@ -35,7 +35,7 @@ OBJ =			o
+@@ -33,9 +33,9 @@ CPLUSPLUS_COMPILER =	$(CXX)
+ CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
+ OBJ =			o
  LINK =			$(CXX) -o
- LINK_OPTS =		-L. $(LDFLAGS)
+-LINK_OPTS =		-L. $(LDFLAGS)
++LINK_OPTS =		-L. $(CPPFLAGS) $(LDFLAGS)
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 -LIBRARY_LINK =		$(CC) -o 
 +LIBRARY_LINK =		$(CXX) -o 

-- 
liblivemedia packaging