diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-libs/xdmf2/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-libs/xdmf2/files')
| -rw-r--r-- | sci-libs/xdmf2/files/xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch | 41 | ||||
| -rw-r--r-- | sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch | 13 |
2 files changed, 54 insertions, 0 deletions
diff --git a/sci-libs/xdmf2/files/xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch new file mode 100644 index 000000000000..99735a480c67 --- /dev/null +++ b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch @@ -0,0 +1,41 @@ +Too much automagic trying to find the correct prefix +of HDF5. Remove all the pointless heuristics. +See also: https://bugs.gentoo.org/show_bug.cgi?id=591302 + +* CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:148 (message): +* Could NOT find HDF5 (missing: HDF5_LIBRARIES HDF5_INCLUDE_DIRS +* HDF5_HL_LIBRARIES) + +--- xdmf2-1.0_p141226/core/CMakeLists.txt ++++ xdmf2-1.0_p141226/core/CMakeLists.txt +@@ -35,19 +35,7 @@ + mark_as_advanced(FORCE Boost_INCLUDE_DIR) + endif(Boost_FOUND) + +-# Find HDF5_ROOT if not set +-if ("$ENV{HDF5_ROOT}" STREQUAL "") +- find_file (HDF5_LIB libhdf5.so HINTS ENV LD_LIBRARY_PATH) +- if (NOT "${HDF5_LIB}" STREQUAL "") +- get_filename_component(HDF5_LIBRARY_DIR "${HDF5_LIB}" PATH) +- get_filename_component(HDF5_ROOT "${HDF5_LIBRARY_DIR}/../" ABSOLUTE) +- set(ENV{HDF5_ROOT} ${HDF5_ROOT}) +- endif (NOT "${HDF5_LIB}" STREQUAL "") +-endif ("$ENV{HDF5_ROOT}" STREQUAL "") +- +-mark_as_advanced(CLEAR HDF5_C_INCLUDE_DIR) +-mark_as_advanced(CLEAR HDF5_hdf5_LIBRARY_DEBUG) +-mark_as_advanced(CLEAR HDF5_hdf5_LIBRARY_RELEASE) ++# Find HDF5 + find_package(HDF5 REQUIRED) + if(HDF5_FOUND) + mark_as_advanced(FORCE HDF5_C_INCLUDE_DIR) +@@ -73,9 +61,6 @@ + endif(HDF5_IS_PARALLEL) + get_filename_component(HDF5_ROOT "${HDF5_INCLUDE_DIR}/../" REALPATH) + set(HDF5_BINARY_DIRS ${HDF5_ROOT}/bin ${HDF5_ROOT}/dll) +- if (NOT HDF5_LIBRARIES) +- find_library (HDF5_LIBRARIES hdf5 HINTS ${HDF5_ROOT} ENV LD_LIBRARY_PATH) +- endif (NOT HDF5_LIBRARIES) + set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${HDF5_LIBRARIES}) + set(XDMF_HDF5_BINARY_DIRS ${HDF5_BINARY_DIRS} PARENT_SCOPE) + set(XDMF_BINARIES ${XDMF_BINARIES} ${HDF5_BINARY_DIRS}) diff --git a/sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch new file mode 100644 index 000000000000..c337ca62f73a --- /dev/null +++ b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch @@ -0,0 +1,13 @@ + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cef5909..46bcb88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -346,4 +346,4 @@ endif(NOT XDMF_BUILD_CORE_ONLY) + + xdmf_create_config_file(${PROJECT_NAME}) + install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" +- DESTINATION ${CMAKE_INSTALL_PREFIX}) ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/) |