summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2016-03-15 00:04:26 +0000
committerSébastien Fabbro <bicatali@gentoo.org>2016-03-18 20:09:58 +0000
commit4cb737b6dc7bd7b2e377ed324491cc4a0859b75d (patch)
treef7c6466bf7211fd277818058214ba6018526b460 /sci-libs/grib_api/files
parentsci-libs/cgnslib: Version bump (diff)
downloadgentoo-4cb737b6dc7bd7b2e377ed324491cc4a0859b75d.tar.gz
gentoo-4cb737b6dc7bd7b2e377ed324491cc4a0859b75d.tar.bz2
gentoo-4cb737b6dc7bd7b2e377ed324491cc4a0859b75d.zip
sci-libs/grib_api: Version bump
Package-Manager: portage-2.2.27
Diffstat (limited to 'sci-libs/grib_api/files')
-rw-r--r--sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch19
-rw-r--r--sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch15
2 files changed, 34 insertions, 0 deletions
diff --git a/sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch b/sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch
new file mode 100644
index 000000000000..6bd6fb53f6e9
--- /dev/null
+++ b/sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch
@@ -0,0 +1,19 @@
+From: Sébastien Fabbro <bicatali@gentoo.org>
+Subject: add missing DESTDIR to respect sandbox install
+
+--- grib_api-1.14.5-Source.orig/fortran/CMakeLists.txt 2016-03-14 22:53:44.310678929 +0000
++++ grib_api-1.14.5-Source/fortran/CMakeLists.txt 2016-03-14 22:55:42.479193350 +0000
+@@ -55,11 +55,11 @@
+ install( CODE
+ "
+ if( EXISTS ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod )
+- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod ${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/grib_api.mod )
++ execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/grib_api.mod )
+ endif()
+
+ if( EXISTS ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod )
+- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod ${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/GRIB_API.mod )
++ execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/GRIB_API.mod )
+ endif()
+ " )
+
diff --git a/sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch b/sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch
new file mode 100644
index 000000000000..0615edc15420
--- /dev/null
+++ b/sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch
@@ -0,0 +1,15 @@
+From: Sébastien Fabbro <bicatali@gentoo.org>
+Subject: comment out failing test
+https://software.ecmwf.int/issues/browse/SUP-521
+--- grib_api-1.14.5-Source.orig/tests/ls.sh 2016-03-14 21:56:28.933867464 +0000
++++ grib_api-1.14.5-Source/tests/ls.sh 2016-03-14 21:56:57.103513324 +0000
+@@ -62,7 +62,8 @@
+
+ # Test for bug GRIB-56
+ ${tools_dir}grib_set -s typeOfLevel=depthBelowLandLayer,topLevel=missing regular_latlon_surface.grib1 tmp_rlls.grib1
+-${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING>/dev/null
++# disabling because MISSING is not there and fails the test
++#${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING>/dev/null
+
+ ${tools_dir}grib_set -s typeOfLevel=depthBelowLandLayer,bottomLevel=missing regular_latlon_surface.grib1 tmp_rlls.grib1
+ ${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING>/dev/null