Bug#763691: cdo FTBFS on ppc64el

2015-05-11 Thread Alastair McKinstry
Hi Bas,

Hold off on a revision, as a new version of cdo has just gone into unstable
for the 'proj' transition.

I am preparing two uploads of cdo, to which I will apply this patch:
(1) cdo-1.6.9, the latest.
(2) cdo-1.6.8 for jessie-backports.

cdo-1.6.9 uses a method grib_get_length() that needs a new version of
the grib_api
library that Enrico Zini is preparing (I think). Hence this depends on
grib_api being updated.

Since this is unlikely to be accepted in jessie-backports  or jessie-pu 
I am preparing
cdo-1.6.8 which does not require this. (Current cdo is 1.6.5).

regards
Alastair

On 09/05/2015 14:52, Sebastiaan Couwenberg wrote:
 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


-- 
Alastair McKinstry, alast...@sceal.ie, mckins...@debian.org, 
https://diaspora.sceal.ie/u/amckinstry
Misentropy: doubting that the Universe is becoming more disordered. 


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#763691: cdo FTBFS on ppc64el

2015-05-11 Thread Sebastiaan Couwenberg
Hi Alastair,

Thanks for the feedback.

 Hold off on a revision, as a new version of cdo has just gone into
 unstable for the 'proj' transition.

Please allow the cdo NMU for the proj transition to migrate to testing
before uploading cdo to unstable again. The cdo NMU I uploaded yesterday
should be sufficient to allow it to migrate to testing.

I'm a little desperate to get qmapshack and qgis into testing so I can
provide jessie-backports for them.

The packages involved in the proj transition should migrate to testing
this week.

 I am preparing two uploads of cdo, to which I will apply this patch:
 (1) cdo-1.6.9, the latest.
 (2) cdo-1.6.8 for jessie-backports.

 cdo-1.6.9 uses a method grib_get_length() that needs a new version of
 the grib_api
 library that Enrico Zini is preparing (I think). Hence this depends on
 grib_api being updated.

 Since this is unlikely to be accepted in jessie-backports  or jessie-pu
 I am preparing
 cdo-1.6.8 which does not require this. (Current cdo is 1.6.5).

Based on the above cdo-1.6.9 should go to experimental where the updated
grib is available too.

cdo-1.6.8 can go to unstable to allow it migrate to testing after which it
can be backported to jessie. But please wait for cdo and the other
packages in the proj transition to migrate to testing first.

Kind Regards,

Bas


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#763691: cdo FTBFS on ppc64el

2015-05-09 Thread Sebastiaan Couwenberg
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.0 +0100
+++ cdo-1.6.5+dfsg.1/debian/changelog   2015-05-09 15:27:14.0 +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 +
 
+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 +
+
 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.0 +0100
+++ cdo-1.6.5+dfsg.1/debian/patches/fix.ppc64el.patch   2015-05-09 
15:25:43.0 +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.0 
+0100
+++ cdo-1.6.5+dfsg.1/debian/patches/series  2015-05-09 15:23:23.0 
+0200
@@ -2,3 +2,4 @@
 ignore.patch
 build-fixes.patch
 gotocc-fix.patch
+fix.ppc64el.patch


Bug#763691: cdo FTBFS on ppc64el

2015-05-04 Thread Jonathan Wiltshire
Control: severity -1 serious

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.

(Severity: serious because FTBFS but did so in the past.)


-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51



signature.asc
Description: Digital signature


Bug#763691: cdo FTBFS on ppc64el

2014-10-02 Thread Alastair McKinstry
If you can test this bug, please go ahead and NMU,

regards
Alastair

On 01/10/2014 22:10, Andreas Barth wrote:
 Control: tag -1 patch

 * Andreas Barth (a...@ayous.org) [141001 22:54]:
 Further on, the build fails with
 libtool: link: gcc -std=gnu99 -g -O2 -fPIE -fstack-protector-strong
 -Wformat -Werror=format-security -Wall -pedantic -fPIC -pthread -fPIE
 -pie -Wl,-z -Wl,relro -Wl,-z -Wl,now -o .libs/cdi cdi.o  -L/usr/lib
 -L/usr/lib/powerpc64le-linux-gnu/hdf5/serial/lib -Wl,--as-needed
 ../src/.libs/libcdi.so -lgrib_api -lnetcdf -lhdf5_hl -lhdf5 -lpng
 -ljasper -lm -ljpeg -lz
 /usr/lib/powerpc64le-linux-gnu/libcurl-gnutls.so -pthread
 ../src/.libs/libcdi.so: undefined reference to `__fsel'

 A fix for this is still wanted (but the references are also
 _ARCH_PWR6-dependend)
 With Aurelians help, this could be fixed by adding an appropriate
 include.


 The (working) patch is
 
 diff -ur cdo-1.6.4+dfsg.1~/libcdi/src/cgribexlib.c 
 cdo-1.6.4+dfsg.1/libcdi/src/cgribexlib.c
 --- cdo-1.6.4+dfsg.1~/libcdi/src/cgribexlib.c   2014-07-05 13:34:19.0 
 +
 +++ cdo-1.6.4+dfsg.1/libcdi/src/cgribexlib.c2014-10-01 21:08:29.080086839 
 +
 @@ -5,6 +5,7 @@
  
  #ifdef _ARCH_PWR6
  #pragma options nostrict
 +#include ppu_intrinsics.h
  #endif
  
  #if defined (HAVE_CONFIG_H)
 @@ -908,8 +909,8 @@
  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++) 
{
 


 I'm happy to help fixing this bug, if useful also by an NMU. As this
 is one of the last few remaining uninstallables in testing I intend to
 do so next week unless there is a reason why not.


 Andi

-- 
Alastair McKinstry, alast...@sceal.ie, mckins...@debian.org, 
https://diaspora.sceal.ie/u/amckinstry
Software is like Poetry - most of it shouldn't have been written.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#763691: cdo FTBFS on ppc64el

2014-10-01 Thread Andreas Barth
Package: cdo
Version: 1.6.4+dfsg.1-5
Severity: important

Hi,

this package FTBFS on ppc64el. Looking at details, this seems to be
due to the fact that the _ARCH_PWR6 is set. In libcdi/src/cgribexlib.c
the following register are not liked by gcc:

double register dmin[__UNROLL_DEPTH_1];
double register dmax[__UNROLL_DEPTH_1];


Further on, the build fails with
libtool: link: gcc -std=gnu99 -g -O2 -fPIE -fstack-protector-strong
-Wformat -Werror=format-security -Wall -pedantic -fPIC -pthread -fPIE
-pie -Wl,-z -Wl,relro -Wl,-z -Wl,now -o .libs/cdi cdi.o  -L/usr/lib
-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial/lib -Wl,--as-needed
../src/.libs/libcdi.so -lgrib_api -lnetcdf -lhdf5_hl -lhdf5 -lpng
-ljasper -lm -ljpeg -lz
/usr/lib/powerpc64le-linux-gnu/libcurl-gnutls.so -pthread
../src/.libs/libcdi.so: undefined reference to `__fsel'

A fix for this is still wanted (but the references are also
_ARCH_PWR6-dependend)


Andi


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#763691: cdo FTBFS on ppc64el

2014-10-01 Thread Andreas Barth
Control: tag -1 patch

* Andreas Barth (a...@ayous.org) [141001 22:54]:
 Further on, the build fails with
 libtool: link: gcc -std=gnu99 -g -O2 -fPIE -fstack-protector-strong
 -Wformat -Werror=format-security -Wall -pedantic -fPIC -pthread -fPIE
 -pie -Wl,-z -Wl,relro -Wl,-z -Wl,now -o .libs/cdi cdi.o  -L/usr/lib
 -L/usr/lib/powerpc64le-linux-gnu/hdf5/serial/lib -Wl,--as-needed
 ../src/.libs/libcdi.so -lgrib_api -lnetcdf -lhdf5_hl -lhdf5 -lpng
 -ljasper -lm -ljpeg -lz
 /usr/lib/powerpc64le-linux-gnu/libcurl-gnutls.so -pthread
 ../src/.libs/libcdi.so: undefined reference to `__fsel'
 
 A fix for this is still wanted (but the references are also
 _ARCH_PWR6-dependend)

With Aurelians help, this could be fixed by adding an appropriate
include.


The (working) patch is

diff -ur cdo-1.6.4+dfsg.1~/libcdi/src/cgribexlib.c 
cdo-1.6.4+dfsg.1/libcdi/src/cgribexlib.c
--- cdo-1.6.4+dfsg.1~/libcdi/src/cgribexlib.c   2014-07-05 13:34:19.0 
+
+++ cdo-1.6.4+dfsg.1/libcdi/src/cgribexlib.c2014-10-01 21:08:29.080086839 
+
@@ -5,6 +5,7 @@
 
 #ifdef _ARCH_PWR6
 #pragma options nostrict
+#include ppu_intrinsics.h
 #endif
 
 #if defined (HAVE_CONFIG_H)
@@ -908,8 +909,8 @@
 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++) 
   {



I'm happy to help fixing this bug, if useful also by an NMU. As this
is one of the last few remaining uninstallables in testing I intend to
do so next week unless there is a reason why not.


Andi


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org