From e805507c58bab294dddb75f6fc9b551d9d92de86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 May 2023 17:23:01 +0100 Subject: gentoo auto-resync : 02:05:2023 - 17:23:00 --- .../files/parmetis-4.0.3_p20230326-multilib.patch | 31 ++++++++++++++ ...rmetis-4.0.3_p20230326-respect-user-flags.patch | 47 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 sci-libs/parmetis/files/parmetis-4.0.3_p20230326-multilib.patch create mode 100644 sci-libs/parmetis/files/parmetis-4.0.3_p20230326-respect-user-flags.patch (limited to 'sci-libs/parmetis/files') diff --git a/sci-libs/parmetis/files/parmetis-4.0.3_p20230326-multilib.patch b/sci-libs/parmetis/files/parmetis-4.0.3_p20230326-multilib.patch new file mode 100644 index 000000000000..cccf5a45f36e --- /dev/null +++ b/sci-libs/parmetis/files/parmetis-4.0.3_p20230326-multilib.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 146bc5f..faa1cfd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,9 +30,9 @@ include_directories(${CMAKE_INSTALL_PREFIX}/include) + + # List of paths that the compiler will search for library files. + # i.e., the -L equivalent +-link_directories(${GKLIB_PATH}/lib) +-link_directories(${METIS_PATH}/lib) +-link_directories(${CMAKE_INSTALL_PREFIX}/lib) ++link_directories(${GKLIB_PATH}/lib${LIB_SUFFIX}) ++link_directories(${METIS_PATH}/lib${LIB_SUFFIX}) ++link_directories(${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + + # List of directories that cmake will look for CMakeLists.txt + add_subdirectory(include) +diff --git a/libparmetis/CMakeLists.txt b/libparmetis/CMakeLists.txt +index b9d6d84..c0553e7 100644 +--- a/libparmetis/CMakeLists.txt ++++ b/libparmetis/CMakeLists.txt +@@ -12,6 +12,6 @@ if(SHARED) + endif() + + install(TARGETS parmetis +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ RUNTIME DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/sci-libs/parmetis/files/parmetis-4.0.3_p20230326-respect-user-flags.patch b/sci-libs/parmetis/files/parmetis-4.0.3_p20230326-respect-user-flags.patch new file mode 100644 index 000000000000..4aa19580619e --- /dev/null +++ b/sci-libs/parmetis/files/parmetis-4.0.3_p20230326-respect-user-flags.patch @@ -0,0 +1,47 @@ +diff --git a/conf/gkbuild.cmake b/conf/gkbuild.cmake +index ec91224..5e66546 100644 +--- a/conf/gkbuild.cmake ++++ b/conf/gkbuild.cmake +@@ -28,17 +28,6 @@ endif(CYGWIN) + if(CMAKE_COMPILER_IS_GNUCC) + # GCC opts. + set(GK_COPTIONS "${GK_COPTIONS} -std=c99 -fno-strict-aliasing") +-# -march=native is not a valid flag on PPC: +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "power|ppc|powerpc|ppc64|powerpc64" OR (APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")) +- set(GK_COPTIONS "${GK_COPTIONS} -mtune=native") +-else() +- set(GK_COPTIONS "${GK_COPTIONS} -march=native") +-endif() +- if(NOT MINGW) +- set(GK_COPTIONS "${GK_COPTIONS} -fPIC") +- endif(NOT MINGW) +-# GCC warnings. +- set(GK_COPTIONS "${GK_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GK_COPTIONS "${GK_COPTIONS} -xc99") +@@ -65,24 +54,6 @@ if(OPENMP) + endif(OPENMP) + + +-# Add various definitions. +-if(GDB) +- set(GK_COPTS "${GK_COPTS} -g") +- set(GK_COPTIONS "${GK_COPTIONS} -Werror") +-else() +- set(GK_COPTS "-O3") +-endif(GDB) +- +- +-if(DEBUG) +- set(GK_COPTS "-Og") +- set(GK_COPTIONS "${GK_COPTIONS} -DDEBUG") +-endif(DEBUG) +- +-if(GPROF) +- set(GK_COPTS "-pg") +-endif(GPROF) +- + if(NOT ASSERT) + set(GK_COPTIONS "${GK_COPTIONS} -DNDEBUG") + endif(NOT ASSERT) -- cgit v1.2.3