[SCM] liblivemedia/master: Link shared libraries with g++ instead of gcc to fix build failure.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26e3fc515167a3316d68c9b9e8a7a8cfed890fb7
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Oct 30 10:14:32 2013 +0100

    Link shared libraries with g++ instead of gcc to fix build failure.

diff --git a/debian/patches/link-library-with-g++.patch b/debian/patches/link-library-with-g++.patch
new file mode 100644
index 0000000..d1222cd
--- /dev/null
+++ b/debian/patches/link-library-with-g++.patch
@@ -0,0 +1,44 @@
+Description: Link shared libraries with g++ instead of gcc to fix build failure.
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- a/config.linux
++++ b/config.linux
+@@ -1,12 +1,12 @@
+ COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+ C =			c
+-C_COMPILER =		cc
++C_COMPILER =		$(CC)
+ C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
+ CPP =			cpp
+-CPLUSPLUS_COMPILER =	c++
++CPLUSPLUS_COMPILER =	$(CXX)
+ CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
+ OBJ =			o
+-LINK =			c++ -o
++LINK =			$(CXX) -o
+ LINK_OPTS =		-L. $(LDFLAGS)
+ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
+ LIBRARY_LINK =		ar cr 
+--- a/config.linux-with-shared-libraries
++++ b/config.linux-with-shared-libraries
+@@ -26,16 +26,16 @@
+ 
+ COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
+ C =			c
+-C_COMPILER =		cc
++C_COMPILER =		$(CC)
+ C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
+ CPP =			cpp
+-CPLUSPLUS_COMPILER =	c++
++CPLUSPLUS_COMPILER =	$(CXX)
+ CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
+ OBJ =			o
+-LINK =			c++ -o
++LINK =			$(CXX) -o
+ LINK_OPTS =		-L. $(LDFLAGS)
+ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
+-LIBRARY_LINK =		gcc -o 
++LIBRARY_LINK =		$(CXX) -o 
+ SHORT_LIB_SUFFIX =	so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
+ LIB_SUFFIX =	 	$(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
+ LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 28dcca2..c18a1f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 020_invalid_casts.patch
 021_ip_mreq_source.patch
 add-pkgconfig-file.patch
+link-library-with-g++.patch

-- 
liblivemedia packaging