On Mon, 4 May 2015 23:44:40 +0100 Jonathan Wiltshire wrote: > cdo again fails to build on ppc64el because Andreas' patch has been > dropped. There is now a blocked transition which I will resolve with a > partial removal on that architecture if it's the only blocker left.
I've prepared an NMU to restore the ppc64el patch. See the attached debdiff. Alastair, will upload a new revision of cdo yourself or shall upload the NMU? Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
diff -Nru cdo-1.6.5+dfsg.1/debian/changelog cdo-1.6.5+dfsg.1/debian/changelog --- cdo-1.6.5+dfsg.1/debian/changelog 2014-10-28 08:50:21.000000000 +0100 +++ cdo-1.6.5+dfsg.1/debian/changelog 2015-05-09 15:27:14.000000000 +0200 @@ -1,3 +1,11 @@ +cdo (1.6.5+dfsg.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Merge changes from cdo (1.6.4+dfsg.1-5.1) NMU. + * Refresh fix.ppc64el.patch for new upstream release. + + -- Bas Couwenberg <sebas...@debian.org> Sat, 09 May 2015 15:27:11 +0200 + cdo (1.6.5+dfsg.1-1) unstable; urgency=medium * New upstream release. @@ -6,6 +14,15 @@ -- Alastair McKinstry <mckins...@debian.org> Tue, 28 Oct 2014 07:42:54 +0000 +cdo (1.6.4+dfsg.1-5.1) unstable; urgency=medium + + + * Non.matainer upload with maintainers permission. + * Fix FTBFS on ppc64el by including ppu_intrinsics.h and removing + register in libcdi/src/cgribexlib.c. Closes: #763691 + + -- Andreas Barth <a...@ayous.org> Thu, 02 Oct 2014 16:47:19 +0000 + cdo (1.6.4+dfsg.1-5) unstable; urgency=medium * Drop building with static libs (not needed anymore?) diff -Nru cdo-1.6.5+dfsg.1/debian/patches/fix.ppc64el.patch cdo-1.6.5+dfsg.1/debian/patches/fix.ppc64el.patch --- cdo-1.6.5+dfsg.1/debian/patches/fix.ppc64el.patch 1970-01-01 01:00:00.000000000 +0100 +++ cdo-1.6.5+dfsg.1/debian/patches/fix.ppc64el.patch 2015-05-09 15:25:43.000000000 +0200 @@ -0,0 +1,28 @@ +Description: Fix FTBFS on ppc64el +Fix FTBFS on ppc64el: + - include ppu_intrinsics.h to resolve __fsel + - remove register from non-registerable variables +Author: Andreas Barth <a...@ayous.org> +Bug-Debian: https://bugs.debian.org/763691 + +--- cdo-1.6.4+dfsg.1.orig/libcdi/src/cgribexlib.c ++++ cdo-1.6.4+dfsg.1/libcdi/src/cgribexlib.c +@@ -15,6 +15,7 @@ + + #ifdef _ARCH_PWR6 + #pragma options nostrict ++#include <ppu_intrinsics.h> + #endif + + #if defined (HAVE_CONFIG_H) +@@ -941,8 +942,8 @@ void pwr6_minmax_val_double_unrolled6(co + size_t i, j; + size_t residual = datasize % __UNROLL_DEPTH_1; + size_t ofs = datasize - residual; +- double register dmin[__UNROLL_DEPTH_1]; +- double register dmax[__UNROLL_DEPTH_1]; ++ double dmin[__UNROLL_DEPTH_1]; ++ double dmax[__UNROLL_DEPTH_1]; + + for ( j = 0; j < __UNROLL_DEPTH_1; j++) + { diff -Nru cdo-1.6.5+dfsg.1/debian/patches/series cdo-1.6.5+dfsg.1/debian/patches/series --- cdo-1.6.5+dfsg.1/debian/patches/series 2014-10-28 08:50:21.000000000 +0100 +++ cdo-1.6.5+dfsg.1/debian/patches/series 2015-05-09 15:23:23.000000000 +0200 @@ -2,3 +2,4 @@ ignore.patch build-fixes.patch gotocc-fix.patch +fix.ppc64el.patch
