Source: icu
Version: 57.1-1
Severity: important
Justification: FTCBFS but built before, transitive build closure of essential
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Hi,

It seems that cross build support got discarded in converting icu from
cdbs to debhelper. Can you put it back? Patch attached.

Helmut
diff --minimal -Nru icu-57.1/debian/changelog icu-57.1/debian/changelog
--- icu-57.1/debian/changelog   2016-08-03 20:49:39.000000000 +0200
+++ icu-57.1/debian/changelog   2016-08-04 06:23:24.000000000 +0200
@@ -1,3 +1,10 @@
+icu (57.1-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Implement cross build support again for debhelper packaging (closes: #-1).
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 04 Aug 2016 06:01:25 +0200
+
 icu (57.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru icu-57.1/debian/control icu-57.1/debian/control
--- icu-57.1/debian/control     2016-08-03 20:49:39.000000000 +0200
+++ icu-57.1/debian/control     2016-08-04 06:09:30.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>> 9~), dpkg-dev (>= 1.16.1~), autotools-dev, g++ 
(>= 4:5-0), g++-5 (>= 5.2.1-10)
+Build-Depends: debhelper (>> 9~), dpkg-dev (>= 1.16.1~), autotools-dev
 Build-Depends-Indep: doxygen (>= 1.7.1)
 Build-Conflicts: clang
 Homepage: http://www.icu-project.org
diff --minimal -Nru icu-57.1/debian/rules icu-57.1/debian/rules
--- icu-57.1/debian/rules       2016-03-27 18:25:14.000000000 +0200
+++ icu-57.1/debian/rules       2016-08-04 06:28:55.000000000 +0200
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/architecture.mk
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -10,9 +12,16 @@
        dh_clean
        find $(CURDIR)/source/ \( -name Makefile -o -name pkgdataMakefile \) \
                -exec rm {} \;
+       rm -Rf build-native
 
 override_dh_auto_configure:
+ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
        dh_auto_configure -- --enable-static
+else
+       dh_auto_configure -B build-native -- --host=$(DEB_BUILD_GNU_TYPE)
+       dh_auto_build -B build-native
+       dh_auto_configure -- --enable-static 
--with-cross-build=$(CURDIR)/build-native
+endif
 
 override_dh_auto_build:
        dh_auto_build --parallel

Reply via email to