Tobias Hansen <tobias.han@gmx.de> (17/06/2012): > The patch looks fine to me. Do you do the upload? Final diff attached. (I almost proposed passing --parallel to dh, so that parallel=n in DEB_BUILD_OPTIONS is automatically taken into account, but your override prevents it from working. You may want to consider using --builddirectory=build, instead of implementing that yourself. ;)) before: real 3m12.548s user 2m23.297s sys 0m25.502s after: real 1m51.108s user 2m45.230s sys 0m26.882s (with lintian being a lengthy invariant) Mraw, KiBi.
diff -Nru allegro4.4-4.4.2/debian/changelog allegro4.4-4.4.2/debian/changelog
--- allegro4.4-4.4.2/debian/changelog 2012-06-02 18:16:06.000000000 +0200
+++ allegro4.4-4.4.2/debian/changelog 2012-06-17 12:14:43.000000000 +0200
@@ -1,3 +1,11 @@
+allegro4.4 (2:4.4.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer's ACK.
+ * Work around ICE on ia64 by using gcc-4.7 there instead of gcc-4.6
+ on this architecture.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 17 Jun 2012 12:12:40 +0200
+
allegro4.4 (2:4.4.2-2) unstable; urgency=low
* debian/patches/fix_ftbfs_with_sbuild.patch:
diff -Nru allegro4.4-4.4.2/debian/control allegro4.4-4.4.2/debian/control
--- allegro4.4-4.4.2/debian/control 2012-05-19 16:03:11.000000000 +0200
+++ allegro4.4-4.4.2/debian/control 2012-06-17 12:11:15.000000000 +0200
@@ -21,7 +21,9 @@
libglu1-mesa-dev,
libpng-dev,
zlib1g-dev,
- libvorbis-dev
+ libvorbis-dev,
+ gcc-4.7 [ia64],
+ g++-4.7 [ia64]
Standards-Version: 3.9.3
Package: liballegro4.4
diff -Nru allegro4.4-4.4.2/debian/rules allegro4.4-4.4.2/debian/rules
--- allegro4.4-4.4.2/debian/rules 2012-06-02 17:56:06.000000000 +0200
+++ allegro4.4-4.4.2/debian/rules 2012-06-17 12:11:15.000000000 +0200
@@ -4,6 +4,11 @@
# export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifeq ($(DEB_BUILD_ARCH),ia64)
+ ICE_WORKAROUND = -DCMAKE_C_COMPILER=gcc-4.7 -DCMAKE_CXX_COMPILER=g++-4.7
+endif
# Use this variable to allow options passed to cmake to be overridable.
# WANT_EXAMPLES and WANT_TESTS are set to ON only to check if they build
@@ -28,7 +33,8 @@
-DWANT_JPGALLEG=ON \
-DWANT_TOOLS=ON \
-DWANT_EXAMPLES=ON \
- -DWANT_TESTS=ON
+ -DWANT_TESTS=ON \
+ $(ICE_WORKAROUND)
DOC_DIR ?= usr/share/doc/allegro4-doc/
DOC_INFO_DIR ?= usr/share/info/
Attachment:
signature.asc
Description: Digital signature