Source: ilmbase Version: 2.2.0-11 Tags: patch User: helm...@debian.org Usertags: rebootstrap
ilmbase fails to cross build from source, because it uses the host architecture compiler to build two build tools. The attached patch fixes that by switching the compiler to CXX_FOR_BUILD, which needs updating configure.ac and thus running autoreconf. Please consider applying it. Helmut
diff --minimal -Nru ilmbase-2.2.0/debian/changelog ilmbase-2.2.0/debian/changelog --- ilmbase-2.2.0/debian/changelog +++ ilmbase-2.2.0/debian/changelog @@ -1,3 +1,13 @@ +ilmbase (2.2.0-11.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Use CXX_FOR_BUILD for compiling build tools. + + Thus add AX_PROG_CXX_FOR_BUILD to configure.ac. + + Thus autoreconf. + + -- Helmut Grohne <hel...@subdivi.de> Wed, 20 Oct 2016 18:23:16 +0200 + ilmbase (2.2.0-11) unstable; urgency=medium [ Mathieu Malaterre ] diff --minimal -Nru ilmbase-2.2.0/debian/control ilmbase-2.2.0/debian/control --- ilmbase-2.2.0/debian/control +++ ilmbase-2.2.0/debian/control @@ -6,8 +6,10 @@ Mathieu Malaterre <ma...@debian.org>, Matteo F. Vescovi <m...@debian.org> Build-Depends: + autoconf-archive, autotools-dev (>= 20100122.1), debhelper (>= 9), + dh-autoreconf, dpkg-dev (>= 1.16.1) Standards-Version: 3.9.7 Homepage: http://www.openexr.com diff --minimal -Nru ilmbase-2.2.0/debian/patches/cross.patch ilmbase-2.2.0/debian/patches/cross.patch --- ilmbase-2.2.0/debian/patches/cross.patch +++ ilmbase-2.2.0/debian/patches/cross.patch @@ -0,0 +1,33 @@ +From: Helmut Grohne <hel...@subdivi.de> +Subject: compile build tools with the build architecture compiler + +Index: ilmbase-2.2.0/configure.ac +=================================================================== +--- ilmbase-2.2.0.orig/configure.ac ++++ ilmbase-2.2.0/configure.ac +@@ -28,6 +28,7 @@ + AC_PROG_LN_S + AC_PROG_LIBTOOL + AC_PROG_MAKE_SET ++AX_PROG_CXX_FOR_BUILD + + dnl + dnl PKGCONFIG preparations +Index: ilmbase-2.2.0/Half/Makefile.am +=================================================================== +--- ilmbase-2.2.0.orig/Half/Makefile.am ++++ ilmbase-2.2.0/Half/Makefile.am +@@ -17,9 +17,11 @@ + + CLEANFILES = eLut eLut.h toFloat toFloat.h + +-eLut_SOURCES = eLut.cpp ++eLut$(EXEEXT): eLut.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + +-toFloat_SOURCES = toFloat.cpp ++toFloat$(EXEEXT): toFloat.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + + eLut.h: eLut + ./eLut > eLut.h diff --minimal -Nru ilmbase-2.2.0/debian/patches/series ilmbase-2.2.0/debian/patches/series --- ilmbase-2.2.0/debian/patches/series +++ ilmbase-2.2.0/debian/patches/series @@ -3,3 +3,4 @@ kfreebsd-support.patch testBoxAlgo.patch testBox.patch +cross.patch diff --minimal -Nru ilmbase-2.2.0/debian/rules ilmbase-2.2.0/debian/rules --- ilmbase-2.2.0/debian/rules +++ ilmbase-2.2.0/debian/rules @@ -21,6 +21,9 @@ ##### OVERRIDES # +override_dh_autoreconf: + dh_autoreconf -- bash ./bootstrap + # Need to set an environment variable to make sure proper linking # against libphtread happens: override_dh_auto_configure: @@ -59,4 +62,4 @@ # Everything else: %: - dh $@ --with autotools_dev + dh $@ --with autoreconf
_______________________________________________ Pkg-phototools-devel mailing list Pkg-phototools-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-phototools-devel
