Hello community, here is the log from the commit of package hdf for openSUSE:Factory checked in at 2017-11-21 15:19:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf (Old) and /work/SRC/openSUSE:Factory/.hdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf" Tue Nov 21 15:19:46 2017 rev:9 rq:542675 version:4.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf/hdf.changes 2017-10-17 01:50:29.184144878 +0200 +++ /work/SRC/openSUSE:Factory/.hdf.new/hdf.changes 2017-11-21 15:20:11.355704775 +0100 @@ -1,0 +2,6 @@ +Tue Nov 14 12:22:07 CET 2017 - [email protected] + +- hdf-4.2.11-tirpc.diff: compile and link against libtirpc, sunrpc + from glibc is deprecated and will be removed shortly. + +------------------------------------------------------------------- New: ---- hdf-4.2.11-tirpc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf.spec ++++++ --- /var/tmp/diff_new_pack.ne4TKc/_old 2017-11-21 15:20:15.279562528 +0100 +++ /var/tmp/diff_new_pack.ne4TKc/_new 2017-11-21 15:20:15.283562383 +0100 @@ -38,6 +38,7 @@ Source99: baselibs.conf Patch0: hdf-4.2.9-maxavailfiles.patch Patch1: hdf-ppc.patch +Patch2: hdf-4.2.11-tirpc.diff Patch4: hdf-4.2.10-arm.patch Patch5: hdf_hdf_util_he_file_c__fix_missing_sentinel.diff Patch6: hdf_mdhdf_ncgen_ncgen.y__fix_noreturn_nonvoid.diff @@ -59,6 +60,7 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libjpeg-devel +BuildRequires: libtirpc-devel BuildRequires: zlib-devel %if 0%{?_openmpi} BuildRequires: openmpi-devel @@ -379,6 +381,7 @@ %setup -q %patch0 -p1 -b .maxavailfiles %patch1 -p1 +%patch2 -p0 %patch4 -p0 -b .arm %patch5 -p1 %patch6 -p1 @@ -419,9 +422,9 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=OFF \ @@ -460,9 +463,9 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -498,9 +501,9 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -ltirpc" \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=OFF \ ++++++ hdf-4.2.11-tirpc.diff ++++++ --- config/cmake/ConfigureChecks.cmake +++ config/cmake/ConfigureChecks.cmake 2017/11/14 10:53:15 @@ -13,8 +13,8 @@ set (${HDF_PREFIX}_HAVE_NETCDF 1) endif (HDF4_ENABLE_NETCDF) -if (CYGWIN) +#if (CYGWIN) CHECK_LIBRARY_EXISTS_CONCAT ("tirpc" xdr_opaque ${${HDF_PREFIX}}_HAVE_RPC) CHECK_INCLUDE_FILE_CONCAT ("rpc/types.h" ${HDF_PREFIX}_HAVE_RPC_TYPES_H) CHECK_INCLUDE_FILE_CONCAT ("rpc/xdr.h" ${HDF_PREFIX}_HAVE_RPC_XDR_H) -endif (CYGWIN) +#endif (CYGWIN) --- mfhdf/CMakeLists.txt +++ mfhdf/CMakeLists.txt 2017/11/14 10:53:37 @@ -1,11 +1,11 @@ cmake_minimum_required (VERSION 2.8.10) PROJECT (HDF4_MFHDF) -if (CYGWIN) +#if (CYGWIN) INCLUDE_DIRECTORIES (/usr/include/tirpc) -else (CYGWIN) - INCLUDE_DIRECTORIES (/usr/include/rpc) -endif (CYGWIN) +#else (CYGWIN) +# INCLUDE_DIRECTORIES (/usr/include/rpc) +#endif (CYGWIN) #----------------------------------------------------------------------------- # Option to build HDF4 Tools --- mfhdf/fortran/CMakeLists.txt +++ mfhdf/fortran/CMakeLists.txt 2017/11/14 10:54:56 @@ -10,11 +10,11 @@ ${HDF4_HDF_TESTSOURCE_DIR} ) -if (CYGWIN) +#if (CYGWIN) INCLUDE_DIRECTORIES (/usr/include/tirpc) -else (CYGWIN) - INCLUDE_DIRECTORIES (/usr/include/rpc) -endif (CYGWIN) +#else (CYGWIN) +# INCLUDE_DIRECTORIES (/usr/include/rpc) +#endif (CYGWIN) add_definitions (-DHDF) --- mfhdf/libsrc/CMakeLists.txt +++ mfhdf/libsrc/CMakeLists.txt 2017/11/14 10:54:25 @@ -52,11 +52,11 @@ set (HDF4_MFHDF_LIBSRC_XCHDRS ${HDF4_BINARY_DIR}/hdf4_netcdf.h) endif (HDF4_ENABLE_NETCDF) -if (CYGWIN) +#if (CYGWIN) INCLUDE_DIRECTORIES (/usr/include/tirpc) -else (CYGWIN) - INCLUDE_DIRECTORIES (/usr/include/rpc) -endif (CYGWIN) +#else (CYGWIN) +# INCLUDE_DIRECTORIES (/usr/include/rpc) +#endif (CYGWIN) INCLUDE_DIRECTORIES (${HDF4_HDFSOURCE_DIR}) INCLUDE_DIRECTORIES (${HDF4_MFHDFSOURCE_DIR})
