[apr] 01/01: Fix FTCBFS

[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 0c890070ad79f7ad2c4fd012bf5deb56436c27ec
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Tue Nov 1 11:19:30 2016 +0100

    Fix FTCBFS
---
 debian/changelog           |  8 ++++++++
 debian/control             |  2 +-
 debian/patches/cross.patch | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e8e6291..4e846f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apr (1.5.2-4.1) UNRELEASED; urgency=medium
+
+  * Fix FTCBFS: (Closes: #840891)
+    + Annotate Build-Depends: python with :any
+    + cross.patch: Build gen_test_char with the build arch compiler
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 15 Oct 2016 19:45:34 +0200
+
 apr (1.5.2-4) unstable; urgency=medium
 
   [ Jean-Michel Vourgère ]
diff --git a/debian/control b/debian/control
index 63c9a56..d43dc43 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Peter Samuelson <peter at p12n.org>, Stefan Fritsch <sf at debian.org>
-Build-Depends: debhelper (>= 9), autoconf, autotools-dev, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python, libsctp-dev [linux-any]
+Build-Depends: debhelper (>= 9), autoconf, autotools-dev, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any]
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-apache/apr.git
 Vcs-Git: git://anonscm.debian.org/pkg-apache/apr.git
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..fe95de5
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,39 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: compile gen_test_char with the build architecture compiler
+
+Index: apr-1.5.2/Makefile.in
+===================================================================
+--- apr-1.5.2.orig/Makefile.in
++++ apr-1.5.2/Makefile.in
+@@ -8,6 +8,7 @@
+ # APR (Apache Portable Runtime) library Makefile.
+ #
+ CPP = @CPP@
++CC_FOR_BUILD ?= cc
+ 
+ # get substituted into some targets
+ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
+@@ -46,7 +47,6 @@
+ 
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ 	build/apr_rules.out tools/gen_test_char at EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
+ 	include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+@@ -138,13 +138,9 @@
+ etags:
+ 	etags `find . -name '*.[ch]'`
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: tools/gen_test_char.c
++tools/gen_test_char at EXEEXT@: tools/gen_test_char.c
+ 	$(APR_MKDIR) tools
+-	$(LT_COMPILE)
+-
+-tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $<
+ 
+ include/private/apr_escape_test_char.h: tools/gen_test_char at EXEEXT@
+ 	$(APR_MKDIR) include/private
diff --git a/debian/patches/series b/debian/patches/series
index 554e1c8..f18a2a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ libtoolize_check.patch
 apr_mcast_v6.patch
 debug_testpoll_failure.patch
 use_fcntl_locking.patch
+cross.patch

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