-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
APPLE: Rework Apple toolchains and add tvOS support
- Loading branch information
1 parent
d41919d
commit 79b231f
Showing
48 changed files
with
741 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #! /bin/sh | ||
|
|
||
| CCTOOLS_PORT_VERSION=11c93763d7e7ce7305163341d08052374e4712de | ||
| export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab | ||
|
|
||
| PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) | ||
| HELPERS_DIR=$PACKAGE_DIR/../.. | ||
| . $HELPERS_DIR/functions.sh | ||
|
|
||
| do_make_bdir | ||
|
|
||
| do_git_fetch cctools-port "https://github.com/tpoechtrager/cctools-port.git" "${CCTOOLS_PORT_VERSION}" | ||
|
|
||
| if [ "$1" = "iphone" ]; then | ||
| TARGETDIR="${TARGET_DIR}" \ | ||
| TRIPLE=aarch64-apple-darwin11 \ | ||
| ./usage_examples/ios_toolchain/build.sh "${SDK_DIR}/"* arm64 | ||
| elif [ "$1" = "tv" ]; then | ||
| # Create an appletv wrapper out of blue | ||
| mv usage_examples/ios_toolchain usage_examples/tvos_toolchain | ||
| for f in usage_examples/tvos_toolchain/*; do | ||
| sed -i -e 's/iPhoneOS/AppleTVOS/g' "$f" | ||
| sed -i -e 's/IPHONEOS_/TVOS_/g' "$f" | ||
| sed -i -e 's/IOS_/TVOS_/g' "$f" | ||
| sed -i -e 's/iphoneos-/tvos-/g' "$f" | ||
| done | ||
|
|
||
| TARGETDIR="${TARGET_DIR}" \ | ||
| TRIPLE=aarch64-apple-darwin11 \ | ||
| ./usage_examples/tvos_toolchain/build.sh "${SDK_DIR}/"* arm64 | ||
| else | ||
| echo "ERROR: Invalid platform specified" | ||
| exit 1 | ||
| fi | ||
|
|
||
|
|
||
| # Create symlinks to arm64 as official Apple tools are named like this | ||
| for f in "${TARGET_DIR}"/bin/aarch64-apple-darwin11-*; do | ||
| ln -s "$(basename "$f")" "$(echo "$f" | sed -e 's|/aarch64-|/arm64-|')" | ||
| done | ||
|
|
||
| # Install codesign shim | ||
| cp "${PACKAGE_DIR}"/codesign "${TARGET_DIR}"/bin | ||
|
|
||
| do_clean_bdir |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
...s-glib/0002-Fix-intl-build-with-iOS.patch → ...s-glib/0003-Fix-intl-build-with-iOS.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| From 37d80b2670669424ba281f558f9ae2ad6a877ed5 Mon Sep 17 00:00:00 2001 | ||
| From 9930def5534c13c812fbd13b53e5cfaa644feb86 Mon Sep 17 00:00:00 2001 | ||
| From: Le Philousophe <lephilousophe@users.noreply.github.com> | ||
| Date: Sun, 17 Oct 2021 16:04:14 +0200 | ||
| Subject: [PATCH 2/2] Fix intl build with iOS | ||
| Subject: [PATCH 3/4] Fix intl build with iOS | ||
|
|
||
| --- | ||
| meson.build | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| diff --git a/meson.build b/meson.build | ||
| index 7022e85ca..429352318 100644 | ||
| index 8d3bf08cc..85b14caf9 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -766,6 +766,9 @@ if host_system == 'darwin' | ||
| @@ -761,6 +761,9 @@ if host_system == 'darwin' | ||
| # know which language flags it's going to use to link. Add to both languages | ||
| # for now. See https://github.com/mesonbuild/meson/issues/3585. | ||
| add_project_link_arguments(osx_ldflags, language : ['objc', 'c']) | ||
| add_project_link_arguments(osx_ldflags, language : ['c']) | ||
| +elif host_system == 'ios' | ||
| + osx_ldflags += ['-Wl,-framework,CoreFoundation'] | ||
| + add_project_link_arguments(osx_ldflags, language : ['c']) | ||
| endif | ||
|
|
||
| # Check for futex(2) | ||
| -- | ||
| 2.30.2 | ||
| 2.38.2 | ||
|
|
Oops, something went wrong.