tpoechtrager/osxcross
1
1
Fork 0
mirror of https://github.com/tpoechtrager/osxcross.git synced 2024-10-03 21:28:33 +03:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: tpoechtrager:500d22dd2ca0883524a1c92f8de4f3d44f9eb076
Branches Tags
tpoechtrager:master
tpoechtrager:testing
tpoechtrager:ppc-test
tpoechtrager:osxcross-1.1
tpoechtrager:cygwin
...
compare: tpoechtrager:84189f3c9c3bcac3952dca882eaa9c93b82399ff
Branches Tags
tpoechtrager:master
tpoechtrager:testing
tpoechtrager:ppc-test
tpoechtrager:osxcross-1.1
tpoechtrager:cygwin

6 Commits
500d22dd2c ... 84189f3c9c

Author SHA1 Message Date
Max Erenberg
84189f3c9c
Merge 21151510c7 into be6ffb3cbc 2024-08-22 16:03:41 +08:00
Thomas Pöchtrager
be6ffb3cbc
Merge pull request #428 from ProjectSynchro/osxcross-any-arch 
osxcross-macports: Properly support "any" version packages.
 2024-08-19 21:48:20 +02:00
Jack Greiner
66ff696a0e
Attempt to support "any" packages that only support one arch. 2024-08-19 14:15:46 -04:00
Thomas Pöchtrager
56d8ec4ec9 Fix Darwin versioning (#427) 2024-08-15 20:26:53 +02:00
Thomas Pöchtrager
ae67f655dc Update osxcross-macports 2024-08-15 17:25:59 +02:00
Max Erenberg
21151510c7 add bzip2-devel as a Linux dependency 2023-11-01 04:41:36 -04:00
4 changed files with 32 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
README.md
View File

@ -214,7 +214,9 @@ This method may require up to 45 GB of free disk space.
An SSD is recommended for this method.
1. Download Xcode like described in 'Packaging the SDK on macOS'
2. Install `clang`, `make`, `libssl-devel`, `lzma-devel` and `libxml2-devel`
2. Install the following packages:\
On Debian/Ubuntu: `apt install clang make libssl-dev libbz2-dev lzma-dev libxml2-dev`\
On Fedora: `dnf install clang make openssl-devel bzip2-devel xz-devel libxml2-devel`
3. Run `./tools/gen_sdk_package_pbzx.sh <xcode>.xip`
4. Copy or move the SDK into the tarballs/ directory

11
build.sh
View File

@ -49,14 +49,17 @@ case $SDK_VERSION in
12.2*) TARGET=darwin21.3; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
12.3*) TARGET=darwin21.4; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
12.4*) TARGET=darwin21.5; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
13|13.0*) TARGET=darwin22; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
13|13.0*) TARGET=darwin22.1; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
13.1*) TARGET=darwin22.2; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
13.2*) TARGET=darwin22.3; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
13.3*) TARGET=darwin22.4; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
14|14.0*) TARGET=darwin23; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.2*) TARGET=darwin23.3; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.4*) TARGET=darwin23.5; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.5*) TARGET=darwin23.6; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.1*) TARGET=darwin23.1; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.2*) TARGET=darwin23.2; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.3*) TARGET=darwin23.3; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.4*) TARGET=darwin23.4; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.5*) TARGET=darwin23.5; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
14.6*) TARGET=darwin23.6; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
15|15.0*) TARGET=darwin24; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
15.1*) TARGET=darwin24.1; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.13; ;;
*) echo "Unsupported SDK"; exit 1 ;;

5
tools/osxcross-macports
View File

@ -84,6 +84,8 @@ case $MACOSX_DEPLOYMENT_TARGET in
11.* ) OSXVERSION="darwin_20" ;;
12.* ) OSXVERSION="darwin_21" ;;
13.* ) OSXVERSION="darwin_22" ;;
14.* ) OSXVERSION="darwin_23" ;;
15.* ) OSXVERSION="darwin_24" ;;
* ) unsupportedDepTarget ;;
esac
@ -321,6 +323,9 @@ getPkgUrl()
if [ -z "$pkg" ]; then
pkg=$(echo "$pkgs" | grep $OSXVERSION | grep "noarch" | uniq | tail -n1)
fi
if [ -z "$pkg" ]; then
pkg=$(echo "$pkgs" | grep "any" | grep $ARCH | uniq | tail -n1)
fi
if [ -z "$pkg" ]; then
pkg=$(echo "$pkgs" | grep "any" | grep "noarch" | uniq | tail -n1)
fi

18
wrapper/target.cpp
View File

@ -75,7 +75,22 @@ OSVersion Target::getSDKOSNum() const {
if (n >= 20.0f) {
int major = 11 + ((int)n % 20);
int minor = (((n - (int)n) * 10.0) - 1.0) + 0.1;
int minor = (int)(((n - (int)n) * 10.0) + 0.1);
// Adjust for early versions where the minor version was offset by -1
// Darwin 23.0 => macOS 14.0
// Darwin 23.1 => macOS 14.1
// Darwin 22.1 => macOS 13.0
// Darwin 22.2 => macOS 13.1
// ...
if (n < 23.0f) {
minor -= 1;
}
return OSVersion(major, minor);
} else {
return OSVersion(10, (int)n - 4);
@ -902,6 +917,7 @@ bool Target::setup() {
if (wliblto == -1)
fargs.push_back("-Wno-liblto");
}
if (getenv("OSXCROSS_ENABLE_WERROR_IMPLICIT_FUNCTION_DECLARATION"))
fargs.push_back("-Werror=implicit-function-declaration");
} else if (isGCC()) {