Commit 36289a81 authored by Axel Beckert's avatar Axel Beckert

Build against system copy of PCRE3

Add build-dependency on libpcre3-dev
parent ccdf22f8
......@@ -15,6 +15,9 @@ mp4h (1.3.1-7) UNRELEASED; urgency=low
+ Use dh_auto_{configure,build,install}
+ Support multiarch lib directories
+ Make clean target more robust
* Build against system copy of PCRE3
+ Add build-dependency on libpcre3-dev
+ No more install README.pcre into /usr/share/doc/mp4h
* Enable test suite at build time
* Apply wrap-and-sort
* Fix the following lintian warnings:
......
......@@ -10,6 +10,7 @@ Build-Depends: autoconf (>= 2.57~),
debhelper (>= 9~),
gettext,
libltdl-dev,
libpcre3-dev,
libtool,
tidy
Build-Conflicts: autoconf2.13, automake1.4
......
......@@ -4,3 +4,4 @@
lintian-cleanup-tg.diff
653362-fix-ftbfs-on-hurd.diff
fix-ftbfs-with-hardening-flags.diff
use-system-pcre.diff
Description: Build against system copy of PCRE3
Author: Axel Beckert <abe@debian.org>
Index: mp4h/Makefile.am
===================================================================
--- mp4h.orig/Makefile.am 2013-04-24 02:26:26.000000000 +0200
+++ mp4h/Makefile.am 2013-04-24 02:26:26.000000000 +0200
@@ -2,12 +2,12 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
-DIST_SUBDIRS = pcre lib src po doc modules tests
+DIST_SUBDIRS = lib src po doc modules tests
if LOADABLE_MODULES
-SUBDIRS = pcre lib src po doc modules tests
+SUBDIRS = lib src po doc modules tests
else
-SUBDIRS = pcre lib src po doc tests
+SUBDIRS = lib src po doc tests
endif
EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool
Index: mp4h/src/Makefile.am
===================================================================
--- mp4h.orig/src/Makefile.am 2013-04-24 02:26:26.000000000 +0200
+++ mp4h/src/Makefile.am 2013-04-24 02:31:37.591153699 +0200
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL)
+INCLUDES = -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL)
bin_PROGRAMS = mp4h
@@ -17,7 +17,7 @@
if LOADABLE_MODULES
mp4h_LDFLAGS = -export-dynamic
endif
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LTLIBINTL@ $(MODULE_LDADD)
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a @DEB_BUILD_MULTIARCH@/libpcre.a @LTLIBINTL@ $(MODULE_LDADD)
include_HEADERS = mp4h.h
noinst_HEADERS = builtin.h
Index: mp4h/configure.ac
===================================================================
--- mp4h.orig/configure.ac 2013-04-24 02:26:26.000000000 +0200
+++ mp4h/configure.ac 2013-04-24 02:33:02.944457265 +0200
@@ -141,10 +141,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`])
AC_CONFIG_FILES([
Makefile
- pcre/Makefile
lib/Makefile
src/Makefile
po/Makefile.in
......@@ -23,9 +23,9 @@ configure-stamp:
tar cvf debian/not-needed-for-build.tar \
intl ABOUT-NLS po/Makefile.in.in aclocal.m4 config.guess config.sub \
config.h.in configure depcomp install-sh ltmain.sh missing \
mkinstalldirs src/ltdl.* `find . -name Makefile.in`
# In the future, an external PCRE should be used if possible
#mv -vi pcre debian/not-needed-for-build/
mkinstalldirs src/ltdl.* `find . -name Makefile.in` pcre
# Use external PCRE and libtool only
rm -rf src/ltdl.* ltmain.sh pcre
test -d m4 || mkdir m4
for f in ${GETTEXT_TOP_FILES}; do \
......
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