From 9f458e8ec52748cca55d16dab4e8cb4868a7cd11 Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Wed, 23 Jul 2025 17:06:35 +1000 Subject: [PATCH] Remove Tiger support from portgroups etc --- _resources/macports1.0/xcode_versions.ini | 1 - .../port1.0/compilers/clang_compilers.tcl | 13 +++---- _resources/port1.0/group/compilers-1.0.tcl | 34 +++++++------------ _resources/port1.0/group/gnustep-1.0.tcl | 4 --- .../group/gobject_introspection-1.0.tcl | 9 ----- _resources/port1.0/group/kde4-1.1.tcl | 3 -- _resources/port1.0/group/muniversal-1.1.tcl | 2 +- _resources/port1.0/group/octave-1.0.tcl | 2 +- .../port1.0/group/qt5_version_info-1.0.tcl | 9 +---- _resources/port1.0/group/wxWidgets-1.0.tcl | 18 ---------- 10 files changed, 20 insertions(+), 75 deletions(-) diff --git a/_resources/macports1.0/xcode_versions.ini b/_resources/macports1.0/xcode_versions.ini index cca66fac4bc..d1d94b44ce8 100644 --- a/_resources/macports1.0/xcode_versions.ini +++ b/_resources/macports1.0/xcode_versions.ini @@ -14,5 +14,4 @@ xcode_version_10.8=5.1.1 5.1 5.0.2 5.0.1 5.0 4.6.3 4.6.2 4.6.1 4.6 4.5.2 4.5.1 4 xcode_version_10.7=4.6.3 4.6.2 4.6.1 4.6 4.5.2 4.5.1 4.5 4.4.1 4.4 4.3.3 4.3.2 4.3.1 4.3 4.2.1 4.2 4.1.1 4.1 xcode_version_10.6=4.2 4.1.1 4.1 4.0.2 4.0.1 4.0 3.2.6 3.2.5 3.2.4 3.2.3 3.2.2 3.2.1 3.2 xcode_version_10.5=3.1.4 3.1.3 3.1.2 3.1.1 3.1 -xcode_version_10.4=2.5 2.4.1 xcode_build=5B1008 diff --git a/_resources/port1.0/compilers/clang_compilers.tcl b/_resources/port1.0/compilers/clang_compilers.tcl index 657e9583295..3a7aecbc4a7 100644 --- a/_resources/port1.0/compilers/clang_compilers.tcl +++ b/_resources/port1.0/compilers/clang_compilers.tcl @@ -47,7 +47,7 @@ if { ${os.major} >= 10 || ${os.platform} ne "darwin"} { } if {${os.platform} eq "darwin"} { - if {${os.major} >= 9 && ${os.major} <= 23} { + if {${os.major} <= 23} { lappend compilers macports-clang-11 if {[option build_arch] ne "arm64"} { lappend compilers macports-clang-10 macports-clang-9.0 @@ -56,19 +56,14 @@ if {${os.platform} eq "darwin"} { } } } - if {${os.major} >= 9 && ${os.major} < 20} { + if {${os.major} < 20} { lappend compilers macports-clang-7.0 \ macports-clang-6.0 \ macports-clang-5.0 } if {${os.major} < 16} { # The Sierra SDK requires a toolchain that supports class properties - if {${os.major} >= 9} { - lappend compilers macports-clang-3.7 - } - lappend compilers macports-clang-3.4 - if {${os.major} < 9} { - lappend compilers macports-clang-3.3 - } + lappend compilers macports-clang-3.7 \ + macports-clang-3.4 } } diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl index e8019c468c1..fb078c1abcb 100644 --- a/_resources/port1.0/group/compilers-1.0.tcl +++ b/_resources/port1.0/group/compilers-1.0.tcl @@ -167,35 +167,27 @@ foreach ver ${gcc_versions} { set clang_versions [list] if { ${os.arch} ne "arm" && ${os.platform} eq "darwin" } { if {${os.major} < 16} { - if {${os.major} < 9} { - lappend clang_versions 3.3 - } - lappend clang_versions 3.4 - if {${os.major} >= 9} { - lappend clang_versions 3.7 - } + lappend clang_versions 3.4 3.7 } - if { ${os.major} >= 9 && ${os.major} < 20 } { + if { ${os.major} < 20 } { lappend clang_versions 5.0 6.0 7.0 8.0 } - if { ${os.major} >= 9 && ${os.major} < 23 } { + if { ${os.major} < 23 } { lappend clang_versions 9.0 10 } } -if { ${os.major} >= 9 || ${os.platform} ne "darwin" } { - if { ${os.major} <= 23 || ${os.platform} ne "darwin"} { - lappend clang_versions 11 - if { ${os.major} >= 11 || ${os.platform} ne "darwin"} { - lappend clang_versions 12 - } - } +if { ${os.major} <= 23 || ${os.platform} ne "darwin"} { + lappend clang_versions 11 if { ${os.major} >= 11 || ${os.platform} ne "darwin"} { - lappend clang_versions 13 14 15 16 17 18 - } - if { ${os.major} >= 15 || ${os.platform} ne "darwin"} { - lappend clang_versions 19 20 devel + lappend clang_versions 12 } } +if { ${os.major} >= 11 || ${os.platform} ne "darwin"} { + lappend clang_versions 13 14 15 16 17 18 +} +if { ${os.major} >= 15 || ${os.platform} ne "darwin"} { + lappend clang_versions 19 20 devel +} ui_debug "Clang versions for Darwin ${os.major} ${os.arch} - ${clang_versions}" foreach ver ${clang_versions} { # Remove dot from version if present @@ -851,7 +843,7 @@ proc compilers::add_gcc_rpath_support {} { global prefix os.platform os.major set gcc_v [compilers::get_current_gcc_version] if { ${gcc_v} >= 10 || ${gcc_v} == "devel" } { - if {${os.platform} eq "darwin" && ${os.major} > 8} { + if {${os.platform} eq "darwin"} { ui_debug "compilers PG: RPATH added to ldflags as GCC version is ${gcc_v}" configure.ldflags-delete -Wl,-rpath,${prefix}/lib/libgcc configure.ldflags-append -Wl,-rpath,${prefix}/lib/libgcc diff --git a/_resources/port1.0/group/gnustep-1.0.tcl b/_resources/port1.0/group/gnustep-1.0.tcl index 694ae493753..036b4567a09 100644 --- a/_resources/port1.0/group/gnustep-1.0.tcl +++ b/_resources/port1.0/group/gnustep-1.0.tcl @@ -151,10 +151,6 @@ proc set_gnustep_env {} { options gnustep.cc default gnustep.cc {CC=${configure.cc}} -platform darwin 8 { - configure.compiler apple-gcc-4.2 - depends_build port:apple-gcc42 -} platform darwin 9 { configure.compiler gcc-4.2 } diff --git a/_resources/port1.0/group/gobject_introspection-1.0.tcl b/_resources/port1.0/group/gobject_introspection-1.0.tcl index 16e4da6c9a0..7af10380cfd 100644 --- a/_resources/port1.0/group/gobject_introspection-1.0.tcl +++ b/_resources/port1.0/group/gobject_introspection-1.0.tcl @@ -43,15 +43,6 @@ proc gobject_introspection_pg::gobject_introspection_setup {} { } } else { depends_lib-append path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection - if {![string match *meson* [option configure.cmd]]} { - platform darwin 8 { - global prefix_frozen - # The rules enabled by gobject-introspection require GNU make 3.81+ - depends_build-append port:gmake - configure.env-append MAKE=${prefix_frozen}/bin/gmake - build.cmd-replace [portbuild::build_getmaketype] ${prefix_frozen}/bin/gmake - } - } if { [string match *cmake* [option configure.cmd] ] } { configure.args-append -DENABLE_GOBJECT_INTROSPECTION=ON diff --git a/_resources/port1.0/group/kde4-1.1.tcl b/_resources/port1.0/group/kde4-1.1.tcl index d532a7f20c6..a7bf80e55fe 100644 --- a/_resources/port1.0/group/kde4-1.1.tcl +++ b/_resources/port1.0/group/kde4-1.1.tcl @@ -17,9 +17,6 @@ set kde4.mirror https://download.kde.org/Attic/ # set compiler to Apple's GCC 4.2 switch ${os.platform}_${os.major} { - darwin_8 { - configure.compiler apple-gcc-4.2 - } darwin_9 { configure.compiler gcc-4.2 } diff --git a/_resources/port1.0/group/muniversal-1.1.tcl b/_resources/port1.0/group/muniversal-1.1.tcl index e85bd0427d5..c9c54207ec1 100644 --- a/_resources/port1.0/group/muniversal-1.1.tcl +++ b/_resources/port1.0/group/muniversal-1.1.tcl @@ -229,7 +229,7 @@ proc muniversal::cpu64bit_capable {} { if {[option os.major] >= 11} { # 10.7 and later only support 64-bit hardware return 1 - } elseif {[option os.major] >= 9 && ![catch {sysctl hw.cpu64bit_capable} result]} { + } elseif {![catch {sysctl hw.cpu64bit_capable} result]} { return $result } elseif {(![catch {sysctl hw.optional.x86_64} is_x86_64] && ${is_x86_64}) || (![catch {sysctl hw.optional.64bitops} is_ppc64] && ${is_ppc64})} { diff --git a/_resources/port1.0/group/octave-1.0.tcl b/_resources/port1.0/group/octave-1.0.tcl index 352610b4503..5ad36e298a6 100644 --- a/_resources/port1.0/group/octave-1.0.tcl +++ b/_resources/port1.0/group/octave-1.0.tcl @@ -236,7 +236,7 @@ pre-destroot { } elseif { ${configure.build_arch} eq "ppc64" } { set short_host_name powerpc64-apple-${os.platform}${os.major}.x.x } elseif { ${os.arch} eq "i386" } { - if { ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } { + if { [sysctl hw.cpu64bit_capable] == 1 } { set short_host_name x86_64-apple-${os.platform}${os.major}.x.x } else { set short_host_name i686-apple-${os.platform}${os.major}.x.x diff --git a/_resources/port1.0/group/qt5_version_info-1.0.tcl b/_resources/port1.0/group/qt5_version_info-1.0.tcl index 30b3cf98bef..a424ddb358f 100644 --- a/_resources/port1.0/group/qt5_version_info-1.0.tcl +++ b/_resources/port1.0/group/qt5_version_info-1.0.tcl @@ -32,14 +32,7 @@ proc qt5.get_default_name {} { # see https://doc.qt.io/qt-5/supported-platforms-and-configurations.html # for older versions, see https://web.archive.org/web/*/http://doc.qt.io/qt-5/supported-platforms-and-configurations.html - if { ${os.major} <= 7 } { - # - # Qt 5 does not support ppc - # see http://doc.qt.io/qt-5/osx-requirements.html - # - return qt55 - # - } elseif { ${os.major} <= 9 } { + if { ${os.major} <= 9 } { # # Mac OS X Tiger (10.4) # Mac OS X Leopard (10.5) diff --git a/_resources/port1.0/group/wxWidgets-1.0.tcl b/_resources/port1.0/group/wxWidgets-1.0.tcl index 2d28a0635d7..783b92507d0 100644 --- a/_resources/port1.0/group/wxWidgets-1.0.tcl +++ b/_resources/port1.0/group/wxWidgets-1.0.tcl @@ -219,22 +219,10 @@ proc wxWidgets._set {option action args} { wxWidgets.name "wxWidgets" wxWidgets.version "3.0" wxWidgets.port "wxWidgets-3.0" - if {${os.major} < 9} { - pre-fetch { - ui_error "${wxWidgets.port} requires macOS 10.5 or later." - return -code error "incompatible macOS version" - } - } } elseif {${args} eq "wxPython-3.0"} { wxWidgets.name "wxPython" wxWidgets.version "3.0" wxWidgets.port "wxPython-3.0" - if {${os.major} < 9} { - pre-fetch { - ui_error "${wxWidgets.port} requires macOS 10.5 or later." - return -code error "incompatible macOS version" - } - } # ugly workaround to allow some C++11-only applications to be built on < 10.9 } elseif {${args} eq "wxWidgets-3.0-cxx11"} { global cxx_stdlib @@ -246,12 +234,6 @@ proc wxWidgets._set {option action args} { wxWidgets.version "3.0" wxWidgets.port "wxWidgets-3.0" } - if {${os.major} < 9} { - pre-fetch { - ui_error "${wxWidgets.port} requires macOS 10.5 or later." - return -code error "incompatible macOS version" - } - } # this doesn't work # PortGroup cxx11 1.1 } elseif {${args} eq "wxGTK-3.0-cxx11"} {