[apr] 01/04: fix build

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr.

commit f7e783cb52cfff7119b59e4a3963f6572bfdcd58
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 12 23:18:33 2014 +0200

    fix build
---
 debian/changelog                 |  7 +++++++
 debian/patches/buildfix_r1589984 | 30 ++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10f5a44..a39e177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apr (1.5.1-2) UNRELEASED; urgency=medium
+
+  * Backport build fix from upstream SVN to avoid building some parts
+    twice. This should also fix the build failure on amd64.
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 12 May 2014 23:16:36 +0200
+
 apr (1.5.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/buildfix_r1589984 b/debian/patches/buildfix_r1589984
new file mode 100644
index 0000000..fcc57e7
--- /dev/null
+++ b/debian/patches/buildfix_r1589984
@@ -0,0 +1,30 @@
+#commit 08f46e7b670a6b2d09436f8f852db9d63de88297
+#Author: Jeff Trawick <trawick at apache.org>
+#Date:   Fri Apr 25 10:51:11 2014 +0000
+#
+#    Merge 1589982 from trunk:
+#    
+#    Avoid remaking gen_test_char and the library unnecessarily.
+#    
+#    
+#    git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1589984 13f79535-47bb-0310-9956-ffa450edef68
+#
+Index: apr/Makefile.in
+===================================================================
+--- apr.orig/Makefile.in
++++ apr/Makefile.in
+@@ -138,11 +138,11 @@ check: $(TARGET_LIB)
+ etags:
+ 	etags `find . -name '*.[ch]'`
+ 
+-make_tools_dir:
++OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
++tools/gen_test_char.lo: tools/gen_test_char.c
+ 	$(APR_MKDIR) tools
++	$(LT_COMPILE)
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+ tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
+ 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a1ac0d1..5bf1e3d 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
+buildfix_r1589984

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