[SCM] liblivemedia/master: Update patch
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Sep 17 09:53:38 UTC 2017
The following commit has been merged in the master branch:
commit 38920bd243dbe3337dacf2ea30969437eec55d1b
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Sep 17 11:48:07 2017 +0200
Update patch
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 52edce0..d92dc59 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 | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ config.linux-with-shared-libraries | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config.linux b/config.linux
index d0ec446..87cd0e6 100644
@@ -28,10 +28,10 @@ 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..612a487 100644
+index df8a8e0..219dacc 100644
--- a/config.linux-with-shared-libraries
+++ b/config.linux-with-shared-libraries
-@@ -33,9 +33,9 @@ CPLUSPLUS_COMPILER = $(CXX)
+@@ -33,12 +33,12 @@ CPLUSPLUS_COMPILER = $(CXX)
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
OBJ = o
LINK = $(CXX) -o
@@ -42,4 +42,8 @@ index df8a8e0..612a487 100644
+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)
+-LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
++LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(CPPFLAGS) $(LDFLAGS)
+ LIBS_FOR_CONSOLE_APPLICATION =
+ LIBS_FOR_GUI_APPLICATION =
+ EXE =
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list