[SCM] libopenshot-audio/master: Do not inject the system libraries via MAINT_APPEND
ghisvail-guest at users.alioth.debian.org
ghisvail-guest at users.alioth.debian.org
Thu Feb 2 17:35:20 UTC 2017
The following commit has been merged in the master branch:
commit 7a4731cc33665c98830e1ed00f05d02e5fdcf031
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Feb 2 16:28:51 2017 +0000
Do not inject the system libraries via MAINT_APPEND
diff --git a/debian/rules b/debian/rules
index f2db505..b377cfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,21 +6,9 @@ include /usr/share/dpkg/architecture.mk
#export DH_VERBOSE = 1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND = \
- -DJUCE_INCLUDE_ZLIB_CODE=0 $(shell pkg-config --cflags zlib) \
- -DJUCE_INCLUDE_JPEGLIB_CODE=0 $(shell pkg-config --cflags libjpeg) \
- -DJUCE_INCLUDE_PNGLIB_CODE=0 $(shell pkg-config --cflags libpng) \
- -pthread
-export DEB_CXXFLAGS_MAINT_APPEND = \
- -DJUCE_INCLUDE_ZLIB_CODE=0 $(shell pkg-config --cflags zlib) \
- -DJUCE_INCLUDE_JPEGLIB_CODE=0 $(shell pkg-config --cflags libjpeg) \
- -DJUCE_INCLUDE_PNGLIB_CODE=0 $(shell pkg-config --cflags libpng) \
- -pthread
-export DEB_LDFLAGS_MAINT_APPEND = \
- $(shell pkg-config --libs zlib) \
- $(shell pkg-config --libs libjpeg) \
- $(shell pkg-config --libs libpng) \
- -lpthread -ldl -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND = -pthread
+export DEB_CXXFLAGS_MAINT_APPEND = -pthread
+export DEB_LDFLAGS_MAINT_APPEND = -lpthread -ldl -Wl,--as-needed
%:
dh $@
--
libopenshot-audio packaging
More information about the pkg-multimedia-commits
mailing list