Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded metis to version 5.1.0.3 #11768

Open
wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- GKlib/Makefile.orig 2013-03-11 20:50:42.000000000 +0100
+++ GKlib/Makefile 2013-03-17 14:26:23.632867727 +0100
--- src/GKlib/Makefile.orig 2013-03-11 20:50:42.000000000 +0100
+++ src/GKlib/Makefile 2013-03-17 14:26:23.632867727 +0100
@@ -41,10 +41,10 @@
CONFIG_FLAGS += -DPCRE=$(pcre)
endif
Expand All @@ -14,8 +14,8 @@
ifneq ($(prefix), not-set)
CONFIG_FLAGS += -DCMAKE_INSTALL_PREFIX=$(prefix)

--- Makefile.origin 2013-03-30 17:24:45.000000000 +0100
+++ Makefile 2013-04-14 20:04:38.887674462 +0200
--- src/Makefile.origin 2013-03-30 17:24:45.000000000 +0100
+++ src/Makefile 2013-04-14 20:04:38.887674462 +0200
@@ -9,6 +9,11 @@
gklib_path = not-set
shared = not-set
Expand Down
19 changes: 7 additions & 12 deletions SPECS-EXTENDED/metis/metis-libmetis.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
--- libmetis/CMakeLists.orig.txt 2011-06-22 19:47:13.000000000 +0200
+++ libmetis/CMakeLists.txt 2013-03-15 17:13:19.948911972 +0100
@@ -4,13 +4,14 @@
file(GLOB metis_sources *.c)
# Build libmetis.
add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
--- src/libmetis/CMakeLists.orig.txt 2011-06-22 19:47:13.000000000 +0200
+++ src/libmetis/CMakeLists.txt 2013-03-15 17:13:19.948911972 +0100
@@ -8,8 +8,9 @@
PRIVATE ${PROJECT_SOURCE_DIR}/src/GKlib ${PROJECT_BINARY_DIR}/src/include
)
target_link_libraries(metis PRIVATE $<$<BOOL:${UNIX}>:m>)
+set_target_properties(metis PROPERTIES SOVERSION 0)
if(UNIX)
target_link_libraries(metis m)
endif()

if(METIS_INSTALL)
install(TARGETS metis
install(TARGETS metis
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ RUNTIME DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
endif()
8 changes: 4 additions & 4 deletions SPECS-EXTENDED/metis/metis-pcre2.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100
+++ GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100
--- src/GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100
+++ src/GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100
@@ -43,7 +43,7 @@
#include <sys/stat.h>

Expand All @@ -9,8 +9,8 @@
#else
#if defined(USE_GKREGEX)
#include "gkregex.h"
--- GKlib/test/Makefile.in.orig.old 2013-03-30 17:24:45.000000000 +0100
+++ GKlib/test/Makefile.in.old 2019-02-05 15:04:35.009847901 +0100
--- src/GKlib/test/Makefile.in.orig.old 2013-03-30 17:24:45.000000000 +0100
+++ src/GKlib/test/Makefile.in.old 2019-02-05 15:04:35.009847901 +0100
@@ -196,7 +196,7 @@

#Libraries needed for linking
Expand Down
18 changes: 9 additions & 9 deletions SPECS-EXTENDED/metis/metis-shared-GKlib.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
--- GKlib/CMakeLists.orig.txt 2013-03-11 20:50:14.000000000 +0100
+++ GKlib/CMakeLists.txt 2013-03-17 19:53:44.220827579 +0100
@@ -7,7 +7,7 @@
--- src/GKlib/CMakeLists.orig.txt 2013-03-11 20:50:14.000000000 +0100
+++ src/GKlib/CMakeLists.txt 2013-03-17 19:53:44.220827579 +0100
@@ -6,7 +6,7 @@
unset(abs)
include(GKlibSystem.cmake)

include_directories(".")
-add_library(GKlib STATIC ${GKlib_sources})
+add_library(GKlib SHARED ${GKlib_sources})
if(UNIX)
target_link_libraries(GKlib m)
endif(UNIX)
@@ -16,6 +16,6 @@
add_subdirectory("test")
target_link_libraries(GKlib PRIVATE $<$<BOOL:${UNIX}>:m>)
target_include_directories(GKlib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

@@ -15,6 +15,6 @@
endif()

install(TARGETS GKlib
- ARCHIVE DESTINATION lib
Expand Down
12 changes: 0 additions & 12 deletions SPECS-EXTENDED/metis/metis-width-datatype.patch

This file was deleted.

4 changes: 2 additions & 2 deletions SPECS-EXTENDED/metis/metis.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"metis-5.1.0.tar.gz": "76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2"
"METIS-5.1.0.3.tar.gz": "c860b393f61ef017f288692b00fd26eec2d3fdbc7a2bb3bed8b0f01e836e53cf"
}
}
}
Loading
Loading