Since the upgrade of math/suitesparse to 5.2.0, it depends unconditionnaly on
math/metis. Because math/metis and math/metis-edf are conflicting, this means that the ports which depend on SuiteSparse and on metis-edf became BROKEN. To solve this problem, this revision adds the missings includes brought by metis-edf to metis. Note for myself: if everything goes well, do not forget to deprecate the port math/metis-edf in a near future.
This commit is contained in:
Thierry Thomas
parent
1dcd559cd5
commit
4291c7c5df
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=469181
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= metis
|
||||
PORTVERSION= 5.1.0
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
|
||||
|
||||
@ -34,21 +34,6 @@ CMAKE_ARGS+= -DOPENMP=1
|
||||
USE_GCC= any
|
||||
.endif
|
||||
|
||||
#.if ${PORT_OPTIONS:MPROFILE}
|
||||
#.if !exists(/usr/lib/libc_p.a)
|
||||
#IGNORE = : you have enabled the PROFILE option, but have not installed \
|
||||
# the base system profiling libraries
|
||||
#.endif
|
||||
#ALL_TARGET_PROFILE= metis
|
||||
#CMAKE_ARGS_PROFILE= -DGPROF=1
|
||||
#PLIST_SUB+= PROFILE=""
|
||||
##PROFILE_FLAGS ?= -pg
|
||||
#WRKSRC_PROFILE = ${WRKSRC}_PROFILE
|
||||
#INSTALL_WRKSRC_PROFILE = ${WRKSRC_PROFILE}/libmetis
|
||||
#.else
|
||||
#PLIST_SUB+= PROFILE="@comment "
|
||||
#.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MSHARED}
|
||||
ALL_TARGET_SHARED= all
|
||||
CMAKE_ARGS_SHARED= -DSHARED=1
|
||||
@ -76,7 +61,7 @@ INSTALL_WRKSRC_STATIC= ${WRKSRC_STATIC}/libmetis
|
||||
PLIST_SUB+= STATIC="@comment "
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
pre-configure:
|
||||
@${REINPLACE_CMD} -e "/^# Add compiler flags/,/^$$/d" \
|
||||
-e "/^check_include_file(execinfo.h/d" \
|
||||
${WRKSRC}/GKlib/GKlibSystem.cmake
|
||||
|
||||
8
math/metis/files/patch-CMakeLists.txt
Normal file
8
math/metis/files/patch-CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
||||
--- CMakeLists.txt.orig 2013-03-30 16:24:45 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -25,3 +25,5 @@ include_directories(include)
|
||||
add_subdirectory("include")
|
||||
add_subdirectory("libmetis")
|
||||
add_subdirectory("programs")
|
||||
+# Borrowed from metis-edf
|
||||
+add_subdirectory("GKlib")
|
||||
@ -1,7 +1,11 @@
|
||||
--- libmetis/CMakeLists.txt.orig 2011-06-22 13:47:13.000000000 -0400
|
||||
+++ libmetis/CMakeLists.txt 2012-07-07 11:05:47.000000000 -0400
|
||||
@@ -4,6 +4,9 @@
|
||||
--- libmetis/CMakeLists.txt.orig 2013-03-30 16:24:45 UTC
|
||||
+++ libmetis/CMakeLists.txt
|
||||
@@ -2,8 +2,13 @@
|
||||
include_directories(.)
|
||||
# Find sources.
|
||||
file(GLOB metis_sources *.c)
|
||||
+# Borrowed from metis-edf
|
||||
+file(GLOB libmetis_h *.h)
|
||||
# Build libmetis.
|
||||
add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
|
||||
+if(SHARED)
|
||||
@ -10,3 +14,10 @@
|
||||
if(UNIX)
|
||||
target_link_libraries(metis m)
|
||||
endif()
|
||||
@@ -13,4 +18,6 @@ if(METIS_INSTALL)
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION lib
|
||||
ARCHIVE DESTINATION lib)
|
||||
+# Borrowed from metis-edf
|
||||
+ install(FILES ${libmetis_h} DESTINATION include/libmetis)
|
||||
endif()
|
||||
|
||||
17
math/metis/files/patch-programs_CMakeLists.txt
Normal file
17
math/metis/files/patch-programs_CMakeLists.txt
Normal file
@ -0,0 +1,17 @@
|
||||
--- programs/CMakeLists.txt.orig 2013-03-30 16:24:45 UTC
|
||||
+++ programs/CMakeLists.txt
|
||||
@@ -13,9 +13,14 @@ foreach(prog gpmetis ndmetis mpmetis m2g
|
||||
# target_link_libraries(${prog} metis profiler)
|
||||
endforeach(prog)
|
||||
|
||||
+# Borrowed from metis-edf
|
||||
+file(GLOB metis_h *.h)
|
||||
+
|
||||
if(METIS_INSTALL)
|
||||
install(TARGETS gpmetis ndmetis mpmetis m2gmetis graphchk cmpfillin
|
||||
RUNTIME DESTINATION bin)
|
||||
+# Borrowed from metis-edf
|
||||
+ install(FILES ${metis_h} DESTINATION include/programs)
|
||||
endif()
|
||||
|
||||
# Try to find subversion revision.
|
||||
@ -4,7 +4,41 @@
|
||||
%%SHARED%%bin/m2gmetis
|
||||
%%SHARED%%bin/mpmetis
|
||||
%%SHARED%%bin/ndmetis
|
||||
%%SHARED%%include/GKlib.h
|
||||
%%SHARED%%include/gk_arch.h
|
||||
%%SHARED%%include/gk_defs.h
|
||||
%%SHARED%%include/gk_externs.h
|
||||
%%SHARED%%include/gk_getopt.h
|
||||
%%SHARED%%include/gk_macros.h
|
||||
%%SHARED%%include/gk_mkblas.h
|
||||
%%SHARED%%include/gk_mkmemory.h
|
||||
%%SHARED%%include/gk_mkpqueue.h
|
||||
%%SHARED%%include/gk_mkpqueue2.h
|
||||
%%SHARED%%include/gk_mkrandom.h
|
||||
%%SHARED%%include/gk_mksort.h
|
||||
%%SHARED%%include/gk_mkutils.h
|
||||
%%SHARED%%include/gk_proto.h
|
||||
%%SHARED%%include/gk_struct.h
|
||||
%%SHARED%%include/gk_types.h
|
||||
%%SHARED%%include/gkregex.h
|
||||
%%STATIC%%include/libmetis/defs.h
|
||||
%%STATIC%%include/libmetis/gklib_defs.h
|
||||
%%STATIC%%include/libmetis/gklib_rename.h
|
||||
%%STATIC%%include/libmetis/macros.h
|
||||
%%STATIC%%include/libmetis/metislib.h
|
||||
%%STATIC%%include/libmetis/proto.h
|
||||
%%STATIC%%include/libmetis/rename.h
|
||||
%%STATIC%%include/libmetis/stdheaders.h
|
||||
%%STATIC%%include/libmetis/struct.h
|
||||
%%SHARED%%include/metis.h
|
||||
%%SHARED%%include/ms_inttypes.h
|
||||
%%SHARED%%include/ms_stat.h
|
||||
%%SHARED%%include/ms_stdint.h
|
||||
%%SHARED%%include/programs/defs.h
|
||||
%%SHARED%%include/programs/metisbin.h
|
||||
%%SHARED%%include/programs/proto.h
|
||||
%%SHARED%%include/programs/struct.h
|
||||
%%SHARED%%lib/libGKlib.a
|
||||
%%STATIC%%lib/libmetis.a
|
||||
%%SHARED%%lib/libmetis.so
|
||||
%%SHARED%%lib/libmetis.so.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user