--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: apr FTCBFS: wrong architecture python, fails to execute gen_test_char
- From: Helmut Grohne <helmut@subdivi.de>
- Date: Sat, 15 Oct 2016 21:10:01 +0200
- Message-id: <20161015190959.a6ilpz6n75w7q4gz@alf.mars>
Source: apr
Version: 1.5.2-4
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
apr fails to cross build from source for two reasons.
* It Build-Depends on python, thus selecting the host architecture
python, which cannot be installed nor executed. Since python is only
used as a build tool, we really want the build architecture python
here.
* It compiles gen_test_char with the host architecture compiler and
then executes it. The tool needs to be built with the build
architecture compiler to be able to run it.
The attached patch fixes both issues. Please consider applying it.
Helmut
diff --minimal -Nru apr-1.5.2/debian/changelog apr-1.5.2/debian/changelog
--- apr-1.5.2/debian/changelog 2016-05-29 15:44:28.000000000 +0200
+++ apr-1.5.2/debian/changelog 2016-10-15 21:06:49.000000000 +0200
@@ -1,3 +1,12 @@
+apr (1.5.2-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Annotate Build-Depends: python with :any
+ + cross.patch: Build gen_test_char with the build arch compiler
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 15 Oct 2016 19:45:34 +0200
+
apr (1.5.2-4) unstable; urgency=medium
[ Jean-Michel Vourgère ]
diff --minimal -Nru apr-1.5.2/debian/control apr-1.5.2/debian/control
--- apr-1.5.2/debian/control 2016-05-28 17:05:39.000000000 +0200
+++ apr-1.5.2/debian/control 2016-10-15 19:45:31.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
Uploaders: Peter Samuelson <peter@p12n.org>, Stefan Fritsch <sf@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 --minimal -Nru apr-1.5.2/debian/patches/cross.patch apr-1.5.2/debian/patches/cross.patch
--- apr-1.5.2/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ apr-1.5.2/debian/patches/cross.patch 2016-10-15 21:04:31.000000000 +0200
@@ -0,0 +1,39 @@
+From: Helmut Grohne <helmut@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@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@EXEEXT@: tools/gen_test_char.c
+ $(APR_MKDIR) tools
+- $(LT_COMPILE)
+-
+-tools/gen_test_char@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@EXEEXT@
+ $(APR_MKDIR) include/private
diff --minimal -Nru apr-1.5.2/debian/patches/series apr-1.5.2/debian/patches/series
--- apr-1.5.2/debian/patches/series 2015-08-21 19:57:29.000000000 +0200
+++ apr-1.5.2/debian/patches/series 2016-10-15 20:49:37.000000000 +0200
@@ -10,3 +10,4 @@
apr_mcast_v6.patch
debug_testpoll_failure.patch
use_fcntl_locking.patch
+cross.patch
--- End Message ---
--- Begin Message ---
Source: apr
Source-Version: 1.5.2-5
We believe that the bug you reported is fixed in the latest version of
apr, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 840891@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Stefan Fritsch <sf@debian.org> (supplier of updated apr package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 10 Dec 2016 17:41:09 +0100
Source: apr
Binary: libapr1 libapr1-dev libapr1-dbg
Architecture: source amd64
Version: 1.5.2-5
Distribution: unstable
Urgency: medium
Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
Changed-By: Stefan Fritsch <sf@debian.org>
Description:
libapr1 - Apache Portable Runtime Library
libapr1-dbg - Apache Portable Runtime Library - Debugging Symbols
libapr1-dev - Apache Portable Runtime Library - Development Headers
Closes: 840891
Changes:
apr (1.5.2-5) unstable; urgency=medium
.
[ Helmut Grohne ]
* Fix FTCBFS: (Closes: #840891)
+ Annotate Build-Depends: python with :any
+ cross.patch: Build gen_test_char with the build arch compiler
Checksums-Sha1:
653aa03193982e77aa0bbc473c36ad3c625d1203 2115 apr_1.5.2-5.dsc
3d674b4578103f007fe2a79820e3ec9cd71d5f85 212856 apr_1.5.2-5.debian.tar.xz
95c25e000d426855ccdcfd29cde56274fa8fe4df 5799 apr_1.5.2-5_amd64.buildinfo
3e7ab4b82c07f30a4ada8b111505f37adab02ef1 274290 libapr1-dbg_1.5.2-5_amd64.deb
09be120f9735f7e71c90e5fb9f748f76f539f66d 676912 libapr1-dev_1.5.2-5_amd64.deb
97906d07c6cd41e04df8693ff483ff32bd3444e3 96610 libapr1_1.5.2-5_amd64.deb
Checksums-Sha256:
b58bb3209c8a28bff47666de6a9bf32292303fdc2433c9fafb15f2a9e6c16ca6 2115 apr_1.5.2-5.dsc
5b253cd3acc284241c3cb4a84d9d16f9c5c7775c8f7a26b3a0068ff174bacf76 212856 apr_1.5.2-5.debian.tar.xz
6a4e3560748e4a629548413c90357e1fc5bd380544da56909f03d402f59dc944 5799 apr_1.5.2-5_amd64.buildinfo
0ea0040575575c192d555df33f39391a7dd97f93e7976e3f172386b4fa601c4a 274290 libapr1-dbg_1.5.2-5_amd64.deb
8fb6d15a9b3de557bac44d0724d7cd2de00c61954c3f8e39db32dfc056e1a13e 676912 libapr1-dev_1.5.2-5_amd64.deb
592690a3b24370c5266f5653102b67f72021f7b24a796ceab3c1de1b3366c8f2 96610 libapr1_1.5.2-5_amd64.deb
Files:
1b9d7f2575973a89824245e83163de0e 2115 libs optional apr_1.5.2-5.dsc
45b1b278ece86a11b6da84405b8d101a 212856 libs optional apr_1.5.2-5.debian.tar.xz
17584d7304e7ca05afbdc912a3f81e6a 5799 libs optional apr_1.5.2-5_amd64.buildinfo
66f7cfe124ad9aadce338af1f4cf49f7 274290 debug extra libapr1-dbg_1.5.2-5_amd64.deb
2c6216f8c04823835f35044acf2a4c07 676912 libdevel optional libapr1-dev_1.5.2-5_amd64.deb
870621e341ff34d77f8509e29623afe0 96610 libs optional libapr1_1.5.2-5_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEOpiNza8JqByyYYsxxodfNUHO/eAFAlhMMewACgkQxodfNUHO
/eDIXw/+I2NsMMPJZm77XsRJ7EyR+AxSsXmDa8/f++9Da3KMrmmkEx++MlvJBIAN
Ye3Kt8ZjWz3i3MVf54MdSO792lLsphZRAg4GZZjUVMusCagnEFbDX65eVyCV7oVj
GNtJ61B2R2vJl+shGH3M06jWajRJmH/l9d/GqoqdQXNt7sg1JazweSutmFzG29zi
ZPc2kH8jJsFzu2DcPgspLpGeWOGfirRsqIi2YV9kLBHkEOuoFmRbaaWa2CjR6ibL
R1un7XRNiaFjhgQzIPdunh1PL7wK/L4eT3DFiac/M46KzLeDModsUqnSyM734AuC
FjkDLqUOrWg46vdLNjj1wBUxOyTtjBxEVgaafGgLdgBD97N0AO/8YxCmpj22PNmN
fTlGS1CRkyUHXE78nQ3BsuBitHkmrTWg0l2KLvlGdrN5ZQ0P4K09ht5WfpBcBY48
3ehrMalpk679Pm9R3ipsvDQoRQWGKz6ma59j2LzISh24P7xD0GNhUDoh6/Nn5qyq
DePn1V/woWpq77feh1a40jS8iIIcw2CXe8P3JY2PhHhaxUZJymy/r2vZdoQCSng/
gztoiKAbCNk7QLcGpF5P8zv4wOWQ82IhJPIq0TSuk3xylHDiNj6vkTlKJFB+T3sE
gtD3uriGwbKD6DmU34AHYsou/JAOw3dYo+CY05F0wvy/kyELBcs=
=JvJ6
-----END PGP SIGNATURE-----
--- End Message ---