diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2021-08-16 17:10:28 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2021-08-16 17:12:32 +0100 |
| commit | b11b637c1a4593fd66fd89d2fce77c57664b54e8 (patch) | |
| tree | 8b8d192bbccd36eb06f7392ba78e804ec4610f4b /sci-libs/hdf5/files | |
| parent | net-analyzer/nagios-plugins: new revision with check_smtp TLS support. (diff) | |
| download | gentoo-b11b637c1a4593fd66fd89d2fce77c57664b54e8.tar.gz gentoo-b11b637c1a4593fd66fd89d2fce77c57664b54e8.tar.bz2 gentoo-b11b637c1a4593fd66fd89d2fce77c57664b54e8.zip | |
sci-libs/hdf5: add 1.12.1
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sci-libs/hdf5/files')
| -rw-r--r-- | sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch new file mode 100644 index 000000000000..8c4dc34cb80c --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch @@ -0,0 +1,103 @@ +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -180,8 +180,8 @@ + #----------------------------------------------------------------------------- + set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) +-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) +-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) ++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}") + set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,13 @@ + endif() + endif () + ++include (GNUInstallDirs) ++set (HDF5_INSTALL_BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}") ++set (HDF5_INSTALL_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}") ++set (HDF5_INSTALL_DOC_DIR "${CMAKE_INSTALL_FULL_DOCDIR}") ++set (HDF5_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set (HDF5_INSTALL_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++ + #----------------------------------------------------------------------------- + # Instructions for use : Sub-Project Build + # +--- a/fortran/src/CMakeLists.txt ++++ b/fortran/src/CMakeLists.txt +@@ -537,8 +537,8 @@ + #----------------------------------------------------------------------------- + set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) +-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) +-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) ++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}") + set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + +--- a/hl/c++/src/CMakeLists.txt ++++ b/hl/c++/src/CMakeLists.txt +@@ -91,8 +91,8 @@ + #----------------------------------------------------------------------------- + set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) +-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) +-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) ++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}") + set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + +--- a/hl/fortran/src/CMakeLists.txt ++++ b/hl/fortran/src/CMakeLists.txt +@@ -324,8 +324,8 @@ + #----------------------------------------------------------------------------- + set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) +-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) +-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) ++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}") + set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + +--- a/hl/src/CMakeLists.txt ++++ b/hl/src/CMakeLists.txt +@@ -123,8 +123,8 @@ + #----------------------------------------------------------------------------- + set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) +-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) +-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) ++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + set (_PKG_CONFIG_LIBNAME "${HDF5_HL_LIB_CORENAME}") + set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1311,8 +1311,8 @@ + #----------------------------------------------------------------------------- + set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) +-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) +-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) ++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}") + set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + +@@ -1419,7 +1419,7 @@ + # ) + install ( + DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html +- DESTINATION ${HDF5_INSTALL_DATA_DIR} ++ DESTINATION ${HDF5_INSTALL_DOC_DIR} + COMPONENT Documents + ) + |