[apr] 03/04: fix out of tree build

Stefan Fritsch sf at moszumanska.debian.org
Wed Nov 20 22:13:21 UTC 2013


This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr.

commit 3185287216cdc3f98d0a0473fea0111e649c1b65
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Nov 16 18:45:53 2013 +0100

    fix out of tree build
---
 debian/patches/fix_out_of_tree_build |   21 +++++++++++++++++++++
 debian/patches/series                |    1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/fix_out_of_tree_build b/debian/patches/fix_out_of_tree_build
new file mode 100644
index 0000000..77cd64c
--- /dev/null
+++ b/debian/patches/fix_out_of_tree_build
@@ -0,0 +1,21 @@
+Index: apr/Makefile.in
+===================================================================
+--- apr.orig/Makefile.in
++++ apr/Makefile.in
+@@ -18,7 +18,7 @@
+ INCDIR=./include
+ OSDIR=$(top_srcdir)/include/arch/@OSDIR@
+ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private
++INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_blddir)/include/private -I$(top_srcdir)/include/private
+ 
+ #
+ # Macros for target determination
+@@ -143,6 +143,7 @@
+ 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+ 
+ include/private/apr_escape_test_char.h: tools/gen_test_char at EXEEXT@
++	mkdir -p include/private
+ 	tools/gen_test_char at EXEEXT@ > $@
+ 
+ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
diff --git a/debian/patches/series b/debian/patches/series
index a1ac0d1..6cf9857 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix_doxygen.patch
 omit_extra_libs.patch
 hurd_shm_flock.patch
 dont_override_external_buildflags
+fix_out_of_tree_build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git



More information about the Pkg-apache-commits mailing list