diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /sci-mathematics/arb/files | |
parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) |
gentoo resync : 21.06.2020
Diffstat (limited to 'sci-mathematics/arb/files')
-rw-r--r-- | sci-mathematics/arb/files/arb-2.18.0-build_type.patch | 21 | ||||
-rw-r--r-- | sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch | 20 |
2 files changed, 41 insertions, 0 deletions
diff --git a/sci-mathematics/arb/files/arb-2.18.0-build_type.patch b/sci-mathematics/arb/files/arb-2.18.0-build_type.patch new file mode 100644 index 000000000000..1db7d5f2df42 --- /dev/null +++ b/sci-mathematics/arb/files/arb-2.18.0-build_type.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec806fe..4101c09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,11 +19,11 @@ endif () + set (BUILD_SHARED_LIBS yes CACHE BOOL "Build shared library or not") + set (BUILD_TESTING no CACHE BOOL "Build tests or not") + +-if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR +- CMAKE_BUILD_TYPE STREQUAL "Release")) +- message("${CMAKE_BUILD_TYPE}") +- message(FATAL_ERROR "CMAKE_BUILD_TYPE must be one of: Debug, Release (current value: '${CMAKE_BUILD_TYPE}')") +-endif () ++# if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR ++# CMAKE_BUILD_TYPE STREQUAL "Release")) ++# message("${CMAKE_BUILD_TYPE}") ++# message(FATAL_ERROR "CMAKE_BUILD_TYPE must be one of: Debug, Release (current value: '${CMAKE_BUILD_TYPE}')") ++# endif () + + if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") + set (PLATFORM "x64") diff --git a/sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch b/sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch new file mode 100644 index 000000000000..e45dec9f3742 --- /dev/null +++ b/sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec806fe..d6136a8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,10 +136,12 @@ if(NOT MSVC) + target_link_libraries(arb m) + endif() + ++include(GNUInstallDirs) ++ + install(TARGETS arb +- RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + ) + + foreach (FOLDER ${FOLDERS}) |