From d95207674073129dbd3667d82f180de7148c29a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Fri, 3 Nov 2023 22:04:35 +0100 Subject: [PATCH] MacPorts updates --- tools/MacPorts/graphics/openimageio/Portfile | 6 +-- tools/MacPorts/lang/libomp/Portfile | 41 +++++--------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/tools/MacPorts/graphics/openimageio/Portfile b/tools/MacPorts/graphics/openimageio/Portfile index 4f0a05e8b0..f05d156aeb 100644 --- a/tools/MacPorts/graphics/openimageio/Portfile +++ b/tools/MacPorts/graphics/openimageio/Portfile @@ -18,9 +18,9 @@ platforms darwin github.setup OpenImageIO oiio 2.4.15.0 v revision 100 -checksums rmd160 31292919a0cb4f9fb4ee92d08add97349280874a \ - sha256 b2d76e3880d25d3b005f7c694811a991ccebb6e396965959d194f79c369ff390 \ - size 47894535 +checksums rmd160 2ccbd4905b7133f730d08a4387ae3641db0d73c3 \ + sha256 67f28a1599eb942a075f23cc35c938f7de0b901a40583da6798cf9a418c56e07 \ + size 47894262 github.tarball_from archive diff --git a/tools/MacPorts/lang/libomp/Portfile b/tools/MacPorts/lang/libomp/Portfile index ee3ca04161..4a73068959 100644 --- a/tools/MacPorts/lang/libomp/Portfile +++ b/tools/MacPorts/lang/libomp/Portfile @@ -29,30 +29,21 @@ epoch 1 subport libomp-devel {} if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { - - version 17.0.3 - revision 0 - if { ${subport} eq "libomp-devel" } { - # Marked obsolete 10/25/2022 - PortGroup obsolete 1.0 - replaced_by libomp + version 11.1.0 + checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ + sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ + size 971628 + livecheck.regex {"llvmorg-([0-9.rc-]+)".*} } else { + version 11.1.0 + checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ + sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ + size 971628 livecheck.regex {"llvmorg-([0-9.]+)".*} } - distname openmp-${version}.src - distfiles ${distname}.tar.xz cmake-${version}.src.tar.xz - - checksums \ - openmp-${version}.src.tar.xz \ - rmd160 a79350f38202f4e9819373a433b1b19cef631eb2 \ - sha256 e04172c067f256d06cd8112abb49bc65f4e1d986a4b49b36cd837dfee3cdd274 \ - size 1273276 \ - cmake-${version}.src.tar.xz \ - rmd160 2f419efae4d3f8c9d87943cf1873031468a19bd7 \ - sha256 54fc534f0da09088adbaa6c3bfc9899a500153b96e60c2fb9322a7aa37b1027a \ - size 8712 + revision 0 if {${os.major} <= 12} { # kmp_alloc.c includes but libc++ is not the default on @@ -104,18 +95,6 @@ cmake.out_of_source yes # According to documentation builds with clang >= 3.3 compiler.blacklist-append {clang < 500} *gcc* -# https://trac.macports.org/ticket/68490# -# Use clang-11-bootstrap on OSX10.11 and older -if {${os.major} <= 15} { - compiler.blacklist-append clang *gcc* - depends_build-append port:clang-11-bootstrap - depends_skip_archcheck-append clang-11-bootstrap - pre-configure { - configure.cc ${prefix}/libexec/clang-11-bootstrap/bin/clang - configure.cxx ${prefix}/libexec/clang-11-bootstrap/bin/clang++ - } -} - if {${os.major} <= 17} { default_variants +universal }