Package: src:autogen
Version: 1:5.18.3-6
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

autogen currently FTCBFS, because it tries to invoke itself during
build. Please apply the attached patch to make autogen invoke the system
copy of autogen during cross builds.

Note that the patch is slightly incomplete. It should really add a
"autogen <profile.cross>" to Build-Depends, but packages with build
profiles currently cannot be uploaded to the archive.

Helmut
diff -Nru autogen-5.18.3/debian/changelog autogen-5.18.3/debian/changelog
--- autogen-5.18.3/debian/changelog     2014-08-06 19:47:48.000000000 +0200
+++ autogen-5.18.3/debian/changelog     2014-09-16 23:30:18.000000000 +0200
@@ -1,3 +1,10 @@
+autogen (1:5.18.3-6.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Do not run host arch executables during cross build. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 16 Sep 2014 23:30:17 +0200
+
 autogen (1:5.18.3-6) unstable; urgency=medium
 
   * Bump build-dep on guile-2.0-dev to a version without #701861.
diff -Nru autogen-5.18.3/debian/patches/cross.diff 
autogen-5.18.3/debian/patches/cross.diff
--- autogen-5.18.3/debian/patches/cross.diff    1970-01-01 01:00:00.000000000 
+0100
+++ autogen-5.18.3/debian/patches/cross.diff    2014-09-17 11:31:42.000000000 
+0200
@@ -0,0 +1,40 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: Do not run host arch executables during cross build
+Last-Update: 2014-09-16
+
+When cross building autogen, one has to install autogen for the build
+architecture, because it uses itself during build.
+
+Index: autogen-5.18.3/configure.ac
+===================================================================
+--- autogen-5.18.3.orig/configure.ac   2014-05-17 16:49:39.000000000 +0200
++++ autogen-5.18.3/configure.ac        2014-09-16 23:31:38.603484754 +0200
+@@ -167,9 +167,15 @@
+ AGnam=autogen${ac_exeext}
+ GDnam=getdefs${ac_exeext}
+ CLnam=columns${ac_exeext}
++if test "$cross_compiling" = "yes"; then
++AGexe=${AGnam}
++GDexe=${GDnam}
++CLexe=${CLexe}
++else
+ AGexe=${ag_top_builddir}/agen5/${AGnam}
+ GDexe=${ag_top_builddir}/getdefs/${GDnam}
+ CLexe=${ag_top_builddir}/columns/${CLnam}
++fi
+ M4_SRC=`cd $srcdir/config ; echo [a-z]*.m4`
+ ENABLE_STATIC=${enable_static}
+ config_end_time=`date +%s 2>/dev/null`
+Index: autogen-5.18.3/xml2ag/Makefile.am
+===================================================================
+--- autogen-5.18.3.orig/xml2ag/Makefile.am     2014-01-10 20:20:57.000000000 
+0100
++++ autogen-5.18.3/xml2ag/Makefile.am  2014-09-17 11:31:21.755480980 +0200
+@@ -34,8 +34,6 @@
+ DOCFILES        = invoke-$(TARG).texi invoke-$(TARG).menu $(TARG).1
+ DISTCLEANFILES  = $(DOCFILES) $(nodist_xml2ag_SOURCES) stamp-*
+ AM_CPPFLAGS     = @INCLIST@ $(LIBXML2_CFLAGS)
+-AGexe           = $(top_builddir)/agen5/autogen
+-CLexe           = $(top_builddir)/columns/columns
+ BOOTENV     = top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)" \
+       PATH=`cd ../columns;pwd`:"$$PATH" CLexe="$(CLexe)"
+ 
diff -Nru autogen-5.18.3/debian/patches/series 
autogen-5.18.3/debian/patches/series
--- autogen-5.18.3/debian/patches/series        2014-08-06 19:46:57.000000000 
+0200
+++ autogen-5.18.3/debian/patches/series        2014-09-16 23:30:33.000000000 
+0200
@@ -2,3 +2,4 @@
 02_fix_hurd_identifiermacro.diff
 03_no_rpath_multiarch.diff
 10_handle_grep_error.diff
+cross.diff

Reply via email to