[emos] 03/05: refresh patches for 4.1.1
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Oct 22 15:13:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository emos.
commit f766af884be9b38b6c27b9abcdbf2a944d004829
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Oct 20 21:43:21 2015 +0100
refresh patches for 4.1.1
---
debian/patches/build_fixes.patch | 12 ++---
debian/patches/shared.patch | 98 ++++++++++++++++++++--------------------
debian/patches/wvqlid2.patch | 8 ++--
3 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/debian/patches/build_fixes.patch b/debian/patches/build_fixes.patch
index 2dfc856..54a3fe5 100644
--- a/debian/patches/build_fixes.patch
+++ b/debian/patches/build_fixes.patch
@@ -3,10 +3,10 @@ Description: Build fix for Hurd-i386 on Debian
Last-Updated: 2015-07-09
Forwarded: no
-Index: emoslib-4.0.7/gribex/csect4.F
+Index: emoslib-4.1.1/gribex/csect4.F
===================================================================
---- emoslib-4.0.7.orig/gribex/csect4.F
-+++ emoslib-4.0.7/gribex/csect4.F
+--- emoslib-4.1.1.orig/gribex/csect4.F
++++ emoslib-4.1.1/gribex/csect4.F
@@ -304,10 +304,10 @@ C Calculate the scale and reference
#endif
#if defined hpR32 || defined (__alpha) || defined hpR64 || defined hpiaR64
@@ -21,10 +21,10 @@ Index: emoslib-4.0.7/gribex/csect4.F
#endif
ZSCALE = 2.0**ISCALE
C
-Index: emoslib-4.0.7/CMakeLists.txt
+Index: emoslib-4.1.1/CMakeLists.txt
===================================================================
---- emoslib-4.0.7.orig/CMakeLists.txt
-+++ emoslib-4.0.7/CMakeLists.txt
+--- emoslib-4.1.1.orig/CMakeLists.txt
++++ emoslib-4.1.1/CMakeLists.txt
@@ -58,7 +58,7 @@ endif()
# build type flags
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index c195926..a058506 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -7,10 +7,10 @@ Description: Enable building shared libs in emoslib (cmake)
Last-Update: 2015-07-09
Forwarded: no
-Index: emoslib-4.0.7/libemos-sp-shared/CMakeLists.txt
+Index: emoslib-4.1.1/libemos-sp-shared/CMakeLists.txt
===================================================================
--- /dev/null
-+++ emoslib-4.0.7/libemos-sp-shared/CMakeLists.txt
++++ emoslib-4.1.1/libemos-sp-shared/CMakeLists.txt
@@ -0,0 +1,21 @@
+foreach( _src ${libemos_srcs} )
+ list( APPEND emos_sp_shared_srcs ../${_src} )
@@ -33,10 +33,10 @@ Index: emoslib-4.0.7/libemos-sp-shared/CMakeLists.txt
+ LIBS grib_api_f90 grib_api_f77 grib_api
+ SOURCES ../libemos_version.c ${emos_sp_shared_srcs}
+ GENERATED ../libemos_version.c )
-Index: emoslib-4.0.7/libemos-dp-shared/CMakeLists.txt
+Index: emoslib-4.1.1/libemos-dp-shared/CMakeLists.txt
===================================================================
--- /dev/null
-+++ emoslib-4.0.7/libemos-dp-shared/CMakeLists.txt
++++ emoslib-4.1.1/libemos-dp-shared/CMakeLists.txt
@@ -0,0 +1,24 @@
+# configure Fortran-based targets for double precision (compilation & linking)
+
@@ -62,11 +62,11 @@ Index: emoslib-4.0.7/libemos-dp-shared/CMakeLists.txt
+ SOURCES ../libemos_version.c ${emos_dp_shared_srcs}
+ GENERATED ../libemos_version.c )
+
-Index: emoslib-4.0.7/CMakeLists.txt
+Index: emoslib-4.1.1/CMakeLists.txt
===================================================================
---- emoslib-4.0.7.orig/CMakeLists.txt
-+++ emoslib-4.0.7/CMakeLists.txt
-@@ -238,6 +238,8 @@ if( HAVE_SINGLE_PRECISION )
+--- emoslib-4.1.1.orig/CMakeLists.txt
++++ emoslib-4.1.1/CMakeLists.txt
+@@ -234,6 +234,8 @@ if( HAVE_SINGLE_PRECISION )
add_subdirectory( libemos-sp )
endif()
add_subdirectory( libemos-dp )
@@ -75,53 +75,53 @@ Index: emoslib-4.0.7/CMakeLists.txt
ecbuild_add_executable(
TARGET libemos_version
-Index: emoslib-4.0.7/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.1.1/cmake/ecbuild_add_library.cmake
===================================================================
---- emoslib-4.0.7.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.0.7/cmake/ecbuild_add_library.cmake
+--- emoslib-4.1.1.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.1.1/cmake/ecbuild_add_library.cmake
@@ -13,7 +13,7 @@
function( ecbuild_add_library_impl )
- set( options NOINSTALL AUTO_VERSION )
-- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
-+ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME SONAME SOVERSION)
- set( multi_value_args SOURCES TEMPLATES LIBS INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
+ set( options NOINSTALL AUTO_VERSION )
+- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
++ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME SONAME SOVERSION)
+ set( multi_value_args SOURCES TEMPLATES LIBS INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
- cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
-@@ -119,6 +119,15 @@ function( ecbuild_add_library_impl )
+ cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
+@@ -125,6 +125,15 @@ function( ecbuild_add_library_impl )
- get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )
- if( _target_pic )
-+ if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
-+ set( _PAR_CFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_CFLAGS}" )
-+ endif()
-+ if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
-+ set( _PAR_CXXFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_CXXFLAGS}" )
-+ endif()
-+ if( "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" )
-+ set( _PAR_FFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_FFLAGS}" )
-+ endif()
- if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
- set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
- endif()
-@@ -130,6 +139,13 @@ function( ecbuild_add_library_impl )
- endif()
- endif()
+ get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )
+ if( _target_pic )
++ if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
++ set( _PAR_CFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_CFLAGS}" )
++ endif()
++ if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
++ set( _PAR_CXXFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_CXXFLAGS}" )
++ endif()
++ if( "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" )
++ set( _PAR_FFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_FFLAGS}" )
++ endif()
+ if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
+ set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
+ endif()
+@@ -136,6 +145,13 @@ function( ecbuild_add_library_impl )
+ endif()
+ endif()
-+ if (DEFINED _PAR_SOVERSION )
-+ set_target_properties( ${_PAR_TARGET} PROPERTIES SOVERSION "${_PAR_SOVERSION}" )
-+ endif()
-+ if (DEFINED _PAR_SONAME )
-+ set_target_properties( ${_PAR_TARGET} PROPERTIES SONAME "${_PAR_SONAME}" )
-+ endif()
++ if (DEFINED _PAR_SOVERSION )
++ set_target_properties( ${_PAR_TARGET} PROPERTIES SOVERSION "${_PAR_SOVERSION}" )
++ endif()
++ if (DEFINED _PAR_SONAME )
++ set_target_properties( ${_PAR_TARGET} PROPERTIES SONAME "${_PAR_SONAME}" )
++ endif()
+
- # define VERSION if requested
- if( DEFINED _PAR_VERSION )
- set_target_properties( ${_PAR_TARGET} PROPERTIES VERSION "${_PAR_VERSION}" )
-Index: emoslib-4.0.7/libemos-dp/CMakeLists.txt
+ # define VERSION if requested
+ if( DEFINED _PAR_VERSION )
+ ecbuild_debug("ecbuild_add_library(${_PAR_TARGET}): set version to ${_PAR_VERSION}")
+Index: emoslib-4.1.1/libemos-dp/CMakeLists.txt
===================================================================
---- emoslib-4.0.7.orig/libemos-dp/CMakeLists.txt
-+++ emoslib-4.0.7/libemos-dp/CMakeLists.txt
+--- emoslib-4.1.1.orig/libemos-dp/CMakeLists.txt
++++ emoslib-4.1.1/libemos-dp/CMakeLists.txt
@@ -21,6 +21,7 @@ ecbuild_add_library(
TYPE STATIC
TARGET emos
@@ -130,10 +130,10 @@ Index: emoslib-4.0.7/libemos-dp/CMakeLists.txt
DEFINITIONS ${LIBEMOS_DEFINITIONS}
SOURCES ../libemos_version.c ${emos_dp_srcs}
GENERATED ../libemos_version.c )
-Index: emoslib-4.0.7/libemos-sp/CMakeLists.txt
+Index: emoslib-4.1.1/libemos-sp/CMakeLists.txt
===================================================================
---- emoslib-4.0.7.orig/libemos-sp/CMakeLists.txt
-+++ emoslib-4.0.7/libemos-sp/CMakeLists.txt
+--- emoslib-4.1.1.orig/libemos-sp/CMakeLists.txt
++++ emoslib-4.1.1/libemos-sp/CMakeLists.txt
@@ -26,6 +26,7 @@ ecbuild_add_library(
TYPE STATIC
TARGET emos_sp
diff --git a/debian/patches/wvqlid2.patch b/debian/patches/wvqlid2.patch
index 01d518b..033d634 100644
--- a/debian/patches/wvqlid2.patch
+++ b/debian/patches/wvqlid2.patch
@@ -4,11 +4,11 @@ Author: Alastair McKInstry <mckinstry at debian.org>
Bug-Debian: http://bugs.debian.org/571396
Last-Updated: 2015-05-17
-Index: emoslib-4.0.7/interpolation/CMakeLists.txt
+Index: emoslib-4.1.1/interpolation/CMakeLists.txt
===================================================================
---- emoslib-4.0.7.orig/interpolation/CMakeLists.txt
-+++ emoslib-4.0.7/interpolation/CMakeLists.txt
-@@ -251,7 +251,7 @@ list( APPEND interpolation_src_files
+--- emoslib-4.1.1.orig/interpolation/CMakeLists.txt
++++ emoslib-4.1.1/interpolation/CMakeLists.txt
+@@ -254,7 +254,7 @@ list( APPEND interpolation_src_files
wv2dx32.F # (unsupported entry point)
wv2dxxx.F
wvqlidx.F
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git
More information about the debian-science-commits
mailing list