Commit aba4f05b authored by Helmut Grohne's avatar Helmut Grohne Committed by Axel Beckert

Link libpcre dynamically

Closes: #901534
parent 4e2756d1
mp4h (1.3.1-17) UNRELEASED; urgency=medium
[ Axel Beckert ]
* Update Vcs-* headers for packaging repository moving to Salsa.
* Drop one-man-team from Maintainer field, set myself personally there
instead. (Closes: #899914)
......@@ -9,6 +10,9 @@ mp4h (1.3.1-17) UNRELEASED; urgency=medium
* Drop no more needed Testsuite field from debian/control.
* Add (mostly redundant) DEP12 debian/upstream/metadata file.
[ Helmut Grohne ]
* Link libpcre dynamically. (Closes: #901534)
-- Axel Beckert <abe@debian.org> Wed, 27 Jun 2018 01:31:56 +0200
mp4h (1.3.1-16) unstable; urgency=medium
......
......@@ -37,7 +37,7 @@ Index: mp4h/src/Makefile.am
mp4h_LDFLAGS = -export-dynamic
endif
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LIBINTL@ $(MODULE_LDADD)
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a @DEB_BUILD_MULTIARCH@/libpcre.a @LIBINTL@ $(MODULE_LDADD)
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a -lpcre @LIBINTL@ $(MODULE_LDADD)
include_HEADERS = mp4h.h
noinst_HEADERS = builtin.h
......@@ -45,11 +45,7 @@ Index: mp4h/configure.ac
===================================================================
--- mp4h.orig/configure.ac 2013-09-25 01:46:25.984808776 +0200
+++ mp4h/configure.ac 2013-09-25 01:46:26.008809186 +0200
@@ -140,10 +140,10 @@
dnl This line is needed for Debian builds
AC_SUBST(CFLAGS)
AC_SUBST([INTLINCL], [])
+AC_SUBST([DEB_BUILD_MULTIARCH], [/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`])
@@ -143,7 +143,6 @@
AC_CONFIG_FILES([
Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment