diff options
| author |   Sébastien Fabbro <bicatali@gentoo.org> | 2016-11-17 17:26:22 +0000 |
|---|---|---|
| committer | Sébastien Fabbro <bicatali@gentoo.org> | 2016-11-17 17:26:48 +0000 |
| commit | 7319893a82b52039b567f54ac500c798caa6c47e (patch) | |
| tree | a7ab5523ef2415b7f3741f0ff71bf774affe0554 /sci-astronomy/esomidas | |
| parent | sci-astronomy/astrometry: fixed a few issues and cleanup (diff) | |
| download | gentoo-7319893a82b52039b567f54ac500c798caa6c47e.tar.gz gentoo-7319893a82b52039b567f54ac500c798caa6c47e.tar.bz2 gentoo-7319893a82b52039b567f54ac500c798caa6c47e.zip | |
sci-astronomy/esomidas: adding a fix for gfortran-6 (bug #594812)
* Fixing an issue with arrays and gfortran >= 6, patch from Debian
* Adding another patch from debian for free, for non-linux setups
Package-Manager: portage-2.3.2
Diffstat (limited to 'sci-astronomy/esomidas')
| -rw-r--r-- | sci-astronomy/esomidas/esomidas-15.09.ebuild | 2 | ||||
| -rw-r--r-- | sci-astronomy/esomidas/files/esomidas-madrid.patch | 25 | ||||
| -rw-r--r-- | sci-astronomy/esomidas/files/esomidas-nonlinux.patch | 23 |
3 files changed, 50 insertions, 0 deletions
diff --git a/sci-astronomy/esomidas/esomidas-15.09.ebuild b/sci-astronomy/esomidas/esomidas-15.09.ebuild index 7efe5eb54a72..17aeea82fd4d 100644 --- a/sci-astronomy/esomidas/esomidas-15.09.ebuild +++ b/sci-astronomy/esomidas/esomidas-15.09.ebuild @@ -34,10 +34,12 @@ PATCHES=( "${FILESDIR}/${PN}-fitswdb.patch" "${FILESDIR}/${PN}-fitswdm_c.patch" "${FILESDIR}/${PN}-log-stdout.patch" + "${FILESDIR}/${PN}-madrid.patch" "${FILESDIR}/${PN}-manpages.patch" "${FILESDIR}/${PN}-mdb_put.patch" "${FILESDIR}/${PN}-no-sp_pty.patch" "${FILESDIR}/${PN}-no-strip.patch" + "${FILESDIR}/${PN}-nonlinux.patch" "${FILESDIR}/${PN}-rarthm_for.patch" "${FILESDIR}/${PN}-selechar_c.patch" "${FILESDIR}/${PN}-system-readline.patch" diff --git a/sci-astronomy/esomidas/files/esomidas-madrid.patch b/sci-astronomy/esomidas/files/esomidas-madrid.patch new file mode 100644 index 000000000000..cd3d8bf3fb00 --- /dev/null +++ b/sci-astronomy/esomidas/files/esomidas-madrid.patch @@ -0,0 +1,25 @@ +Author: Ole Streicher <olebole@debian.org> +Description: Fix size of MADRID array in test + When gfortran-6 is called with an optimization (-O1 or higher), arrays with a + length 1 seem to be converted to a scalar and assumed to always return the same + value. + . + This fails with the MADRID array, which is a placeholder for an array. + Specifically ftoc_commf.for fails then, which leads to a missing ftoc_comm.h. + . + The simple workaround is to use a size > 1 here. + . + Note that the MADRID array is defined with a length=1 in ~350 places all over + eso-midas. They are not changed yet since the verification succeeds. If we get + strange bugreports, this may be considered as the problem. +--- a/system/ftoc-new/ftoc_commf.for ++++ b/system/ftoc-new/ftoc_commf.for +@@ -34,7 +34,7 @@ + C + PROGRAM F2CCOM + C +- INTEGER MADRID(1) ++ INTEGER MADRID(3) + INTEGER VALUE(3) + INTEGER STAT,MANY,NOPIX,NOBYT + INTEGER*8 PNTR diff --git a/sci-astronomy/esomidas/files/esomidas-nonlinux.patch b/sci-astronomy/esomidas/files/esomidas-nonlinux.patch new file mode 100644 index 000000000000..e5f68f11e618 --- /dev/null +++ b/sci-astronomy/esomidas/files/esomidas-nonlinux.patch @@ -0,0 +1,23 @@ +Author: Ole Streicher <olebole@debian.org> +Description: Fixes for non-linux (kFreeBSD, Hurd) +--- a/system/unix/inmidas ++++ b/system/unix/inmidas +@@ -425,7 +425,7 @@ + # + os=`uname` + case "$os" in +- "SunOS"|"Linux") ++ SunOS|Linux|GNU|GNU/*) + if [ -z "$LD_LIBRARY_PATH" ] ; then + LD_LIBRARY_PATH=$MIDASHOME/$MIDVERS/lib + else +--- a/test/prim/veriall.prg ++++ b/test/prim/veriall.prg +@@ -204,6 +204,7 @@ + write/keyw in_b MID_WORK:veriall_{out_b(1:{inputi})}.{inputc}
+ endif
+ endif
++write/keyw in_b MID_WORK:veriall_debian.{inputc}
+ open/file {in_b} write fc
+ if fc(1) .lt. 0 then
+ write/out Could not create file: "MID_WORK:veriall_{out_b}.{inputc} ..."
|