macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

portpkg: set hostArchitectures in Distribution

Browse Source 
Also add a todo for the more difficult mpkg case.
This commit is contained in:
Joshua Root
2025-01-29 09:47:48 +11:00
parent bdeaa8144d
commit 1d21d1914a
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/package1.0/portmpkg.tcl
+2
View File
@@ -198,6 +198,8 @@ proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
}
proc portmpkg::write_distribution {dfile portname dependencies} {
# TODO: Set hostArchitectures. This requires calculating the intersection
# of the archs of all the component pkgs.
global macosx_deployment_target
set portname [xml_escape $portname]
set dfd [open $dfile w+]
src/package1.0/portpkg.tcl
+16 -1
View File
@@ -408,6 +408,21 @@ proc portpkg::write_package_info {infofile} {
close $infofd
}
# Return a hostArchitectures Distribution attribute reflecting the
# architectures that this pkg will work on.
proc portpkg::get_hostArchitectures {} {
global supported_archs configure.build_arch configure.universal_archs
if {$supported_archs eq "noarch"} {
return \ hostArchitectures="arm64,i386,ppc,x86_64"
} elseif {[variant_exists universal] && [variant_isset universal] && [llength ${configure.universal_archs}] >= 2} {
return \ hostArchitectures="[join [lsort -ascii ${configure.universal_archs}] ,]"
} elseif {${configure.build_arch} ne ""} {
return \ hostArchitectures="${configure.build_arch}"
} else {
return {}
}
}
proc portpkg::write_distribution {dfile portname portversion portrevision} {
global macosx_deployment_target
set portname_e [xml_escape $portname]
@@ -415,7 +430,7 @@ proc portpkg::write_distribution {dfile portname portversion portrevision} {
puts $dfd "<?xml version=\"1.0\" encoding=\"utf-8\"?>
<installer-gui-script minSpecVersion=\"1\">
<title>${portname_e}</title>
<options customize=\"never\"/>
<options customize=\"never\"[get_hostArchitectures]/>
<allowed-os-versions><os-version min=\"${macosx_deployment_target}\"/></allowed-os-versions>
<background file=\"background.tiff\" mime-type=\"image/tiff\" alignment=\"bottomleft\" scaling=\"none\"/>
<welcome mime-type=\"text/html\" file=\"Welcome.html\"/>