[SCM] liblivemedia/master: Refresh

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Dec 22 21:46:14 UTC 2015


The following commit has been merged in the master branch:
commit 127bfed8ab82937d79199cb4ea203619b6d34abb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Dec 22 22:11:43 2015 +0100

    Refresh

diff --git a/debian/patches/link-library-with-g++.patch b/debian/patches/link-library-with-g++.patch
index d1222cd..06bb3f1 100644
--- a/debian/patches/link-library-with-g++.patch
+++ b/debian/patches/link-library-with-g++.patch
@@ -21,23 +21,11 @@ Author: Benjamin Drung <bdrung at debian.org>
  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
+@@ -35,7 +35,7 @@
+ LINK =			$(CXX) -o
  LINK_OPTS =		-L. $(LDFLAGS)
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
--LIBRARY_LINK =		gcc -o 
+-LIBRARY_LINK =		$(CC) -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)

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list