diff options
Diffstat (limited to 'sci-libs/hdf5/files')
-rw-r--r-- | sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch | 103 | ||||
-rw-r--r-- | sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch | 164 |
2 files changed, 0 insertions, 267 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 deleted file mode 100644 index 8c4dc34cb80c..000000000000 --- a/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- 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 - ) - diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch deleted file mode 100644 index 6ea7520c0f13..000000000000 --- a/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch +++ /dev/null @@ -1,164 +0,0 @@ -https://github.com/HDFGroup/hdf5/pull/1716 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,13 @@ if (CMAKE_VERSION VERSION_LESS "3.14.0") - 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/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -173,8 +173,8 @@ endif () - #----------------------------------------------------------------------------- - 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/doxygen/CMakeLists.txt -+++ b/doxygen/CMakeLists.txt -@@ -36,7 +36,7 @@ if (DOXYGEN_FOUND) - - install ( - DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html -- DESTINATION ${HDF5_INSTALL_DATA_DIR} -+ DESTINATION ${HDF5_INSTALL_DOC_DIR} - COMPONENT Documents - ) - ---- a/fortran/src/CMakeLists.txt -+++ b/fortran/src/CMakeLists.txt -@@ -537,8 +537,8 @@ endif () - #----------------------------------------------------------------------------- - 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 @@ endif () - #----------------------------------------------------------------------------- - 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 @@ endif () - #----------------------------------------------------------------------------- - 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 @@ endif () - #----------------------------------------------------------------------------- - 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 -@@ -1288,8 +1288,8 @@ endif () - #----------------------------------------------------------------------------- - 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}") - ---- a/CMakeInstallation.cmake -+++ b/CMakeInstallation.cmake -@@ -31,7 +31,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) - if (HDF5_EXPORTED_TARGETS) - install ( - EXPORT ${HDF5_EXPORTED_TARGETS} -- DESTINATION ${HDF5_INSTALL_CMAKE_DIR} -+ DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake - FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake - NAMESPACE ${HDF_PACKAGE_NAMESPACE} - COMPONENT configinstall -@@ -67,12 +67,12 @@ set (HDF5_VERSION_MINOR ${HDF5_PACKAGE_VERSION_MINOR}) - # Configure the hdf5-config.cmake file for the build directory - #----------------------------------------------------------------------------- - set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR}) --set (SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_CMAKE_DIR}" ) -+set (SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_LIB_DIR}/cmake" ) - set (CURRENT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}" ) - configure_package_config_file ( - ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in - "${HDF5_BINARY_DIR}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake" -- INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}" -+ INSTALL_DESTINATION "${HDF5_INSTALL_LIB_DIR}/cmake" - PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR - INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}" - ) -@@ -81,19 +81,19 @@ configure_package_config_file ( - # Configure the hdf5-config.cmake file for the install directory - #----------------------------------------------------------------------------- - set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR}) --set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_CMAKE_DIR}" ) -+set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_LIB_DIR}/cmake" ) - set (CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" ) - configure_package_config_file ( - ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in - "${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake" -- INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}" -+ INSTALL_DESTINATION "${HDF5_INSTALL_LIB_DIR}/cmake" - PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR - ) - - if (NOT HDF5_EXTERNALLY_CONFIGURED) - install ( - FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake -- DESTINATION ${HDF5_INSTALL_CMAKE_DIR} -+ DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake - COMPONENT configinstall - ) - endif () -@@ -109,7 +109,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) - ) - install ( - FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake -- DESTINATION ${HDF5_INSTALL_CMAKE_DIR} -+ DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake - COMPONENT configinstall - ) - endif () |