From b264a335bdd0c953a31e2fd578114f84a7adee9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= Date: Fri, 3 Jan 2025 11:51:53 +0000 Subject: [PATCH] plfit: update to 1.0.1 - update to version 1.0.1 - fix functionality of default +openmp variant --- math/plfit/Portfile | 15 ++++++--------- math/plfit/files/patch-fix-linking-gcc.diff | 11 ----------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 math/plfit/files/patch-fix-linking-gcc.diff diff --git a/math/plfit/Portfile b/math/plfit/Portfile index 2baf5b7beb8..91cba78c5a2 100644 --- a/math/plfit/Portfile +++ b/math/plfit/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup cmake 1.1 PortGroup github 1.0 -github.setup ntamas plfit 1.0.0 +github.setup ntamas plfit 1.0.1 revision 0 github.tarball_from archive @@ -16,9 +16,9 @@ long_description This program fits power-law distributions to empirical (disc or continuous) data, according to the method of Clauset, Shalizi \ and Newman. -checksums rmd160 58af3ed82ea2a939097bc73d7c7c07e56695b87f \ - sha256 b64eff580c721809d32be69c43070c37c9200ca02e5169d9ae7972fbd759977e \ - size 185990 +checksums rmd160 dc9e2a090bb848a5b6093b6725cfb7bf64ba9dc5 \ + sha256 523868c283f334329084df457739baf29b0a21e679830e5326965b0d128db1d4 \ + size 186015 test.run yes test.target test @@ -33,13 +33,12 @@ configure.pre_args-replace \ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF -# ld: unknown option: --version-script=/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_math_plfit/plfit/work/plfit-1.0.0/src/plfit.map -patchfiles-append patch-fix-linking-gcc.diff - variant openmp description {Enable OpenMP support} { configure.args-replace -DPLFIT_USE_OPENMP=OFF -DPLFIT_USE_OPENMP=ON } +default_variants +openmp + # See https://github.com/macports/macports-base/commit/7c91604891fa0d071b8d598490c4dc2edb8e0031 if {[variant_isset openmp]} { compiler.openmp_version 2.0 @@ -50,5 +49,3 @@ if {[variant_isset openmp]} { configure.ldflags-append -fopenmp } } - -default_variants +openmp diff --git a/math/plfit/files/patch-fix-linking-gcc.diff b/math/plfit/files/patch-fix-linking-gcc.diff deleted file mode 100644 index 49d331564cb..00000000000 --- a/math/plfit/files/patch-fix-linking-gcc.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CMakeLists.txt 2024-11-21 17:12:31.000000000 +0800 -+++ src/CMakeLists.txt 2024-12-03 09:42:09.000000000 +0800 -@@ -25,7 +25,7 @@ - target_link_libraries(plfit OpenMP::OpenMP_C) - endif() - --if(CMAKE_C_COMPILER_ID STREQUAL "GNU") -+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) - set_target_properties(plfit PROPERTIES LINK_FLAGS "-Wl,--version-script=${PROJECT_SOURCE_DIR}/src/plfit.map") - set_target_properties(plfit PROPERTIES LINK_DEPENDS ${PROJECT_SOURCE_DIR}/src/plfit.map) - endif()