Source: open-invaders Severity: normal Tags: patch User: debian-powe...@lists.debian.org Usertags: ppc64el
Dear Maintainer, The package open-invaders fails to build from source on ppc64el due to the lack of detection of 64bit in the header file headers/pmask.h. The package already contains a patch that fixes that for some architectures and the bug report #754361 fixes it for mips64. Thus I put them together in the patch attached. Additionally I also included dh-autoreconf usage to the patch. Thanks and regards. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: ppc64el (ppc64le) Kernel: Linux 3.13-1-powerpc64le (SMP w/4 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru open-invaders-0.3/debian/changelog open-invaders-0.3/debian/changelog --- open-invaders-0.3/debian/changelog 2012-09-10 13:28:23.000000000 +0000 +++ open-invaders-0.3/debian/changelog 2014-09-05 15:48:21.000000000 +0000 @@ -1,3 +1,12 @@ +open-invaders (0.3-4ppc64el1) UNRELEASED; urgency=medium + + * Added dh-autoreconf and dependency to the build in debian/rules. + * Patch debian/patches/fix_pmask_64bit.patch: + - Additional support for ppc64 and mips64. The latter was gathered from #754361 + by YunQiang Su <s...@debian.org>. + + -- Fernando Seiti Furusato <ferse...@br.ibm.com> Fri, 05 Sep 2014 15:44:03 +0000 + open-invaders (0.3-4) unstable; urgency=medium * Acknowledge NMUs. Thanks Alexander and Tobias! diff -Nru open-invaders-0.3/debian/control open-invaders-0.3/debian/control --- open-invaders-0.3/debian/control 2012-09-10 13:12:16.000000000 +0000 +++ open-invaders-0.3/debian/control 2014-09-05 15:39:35.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Siegfried-Angel Gevatter Pujals <rai...@ubuntu.com> Homepage: http://www.jamyskis.net/invaders.php Build-Depends: debhelper (>= 7.0.50), - autotools-dev, + dh-autoreconf, libaldmb1-dev (>= 1:0.9.3), liballegro4-dev, libxext-dev, diff -Nru open-invaders-0.3/debian/patches/fix_pmask_64bit.patch open-invaders-0.3/debian/patches/fix_pmask_64bit.patch --- open-invaders-0.3/debian/patches/fix_pmask_64bit.patch 1970-01-01 00:00:00.000000000 +0000 +++ open-invaders-0.3/debian/patches/fix_pmask_64bit.patch 2014-09-05 15:42:51.000000000 +0000 @@ -0,0 +1,18 @@ +Index: open-invaders-0.3/headers/pmask.h +=================================================================== +--- open-invaders-0.3.orig/headers/pmask.h 2014-09-05 15:39:40.000000000 +0000 ++++ open-invaders-0.3/headers/pmask.h 2014-09-05 15:42:43.410002471 +0000 +@@ -36,8 +36,11 @@ + //e.g. 4 for 16-bit ints, 5 for 32-bit ints, 6 for 64-bit ints + //don't worry about setting it incorrectly + //you'll get a compile error if you do, not a run-time error +-#define MASK_WORD_BITBITS 5 +- ++#if defined(__alpha__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390x__) || defined(__mips64) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) ++ #define MASK_WORD_BITBITS 6 ++#else ++ #define MASK_WORD_BITBITS 5 ++#endif + + //if SINGLE_MEMORY_BLOCK is defined + //then each mask will be allocated as diff -Nru open-invaders-0.3/debian/patches/fix_pmask_amd64.patch open-invaders-0.3/debian/patches/fix_pmask_amd64.patch --- open-invaders-0.3/debian/patches/fix_pmask_amd64.patch 2011-09-03 20:04:47.000000000 +0000 +++ open-invaders-0.3/debian/patches/fix_pmask_amd64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Index: open-invaders-0.3/headers/pmask.h -=================================================================== ---- open-invaders-0.3.orig/headers/pmask.h 2011-09-03 22:04:17.000000000 +0200 -+++ open-invaders-0.3/headers/pmask.h 2011-09-03 22:04:13.000000000 +0200 -@@ -36,7 +36,11 @@ - //e.g. 4 for 16-bit ints, 5 for 32-bit ints, 6 for 64-bit ints - //don't worry about setting it incorrectly - //you'll get a compile error if you do, not a run-time error --#define MASK_WORD_BITBITS 5 -+#if defined(__alpha__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) -+ #define MASK_WORD_BITBITS 6 -+#else -+ #define MASK_WORD_BITBITS 5 -+#endif - - - //if SINGLE_MEMORY_BLOCK is defined diff -Nru open-invaders-0.3/debian/patches/series open-invaders-0.3/debian/patches/series --- open-invaders-0.3/debian/patches/series 2012-06-06 09:58:07.000000000 +0000 +++ open-invaders-0.3/debian/patches/series 2014-09-05 15:40:06.000000000 +0000 @@ -1,3 +1,3 @@ +fix_pmask_64bit.patch fix_ftbfs_gcc45.patch -fix_pmask_amd64.patch format_security.patch diff -Nru open-invaders-0.3/debian/rules open-invaders-0.3/debian/rules --- open-invaders-0.3/debian/rules 2012-06-06 10:21:06.000000000 +0000 +++ open-invaders-0.3/debian/rules 2014-09-05 15:38:58.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with autoreconf override_dh_auto_configure: # Patch wrong library names in Makefile
