Compare commits

...

7 Commits

Author SHA1 Message Date
Dean M Greer
c37ec76c38
Merge 64d99dbb43 into fd32ecc6e0 2024-06-27 16:10:11 -05:00
Thomas Pöchtrager
fd32ecc6e0
Merge pull request #424 from nicksherron/package_name_fix
Fix misnamed "packet manager" to "package manager"  in docs
2024-06-27 08:19:16 +02:00
Nick Sherron
ed38a713da
Fix misnamed "packet manager" to "package manager" in docs 2024-06-26 19:49:41 -04:00
Thomas Pöchtrager
b8e6ccbaec
Merge pull request #415 from akien-mga/osx-14.1-14.2-14.3
Add support for MacOSX SDKs 14.2, 14.4 and 14.5
2024-06-20 18:18:25 +02:00
Rémi Verschelde
f740da741c
Add support for MacOSX SDKs 14.2, 14.4 and 14.5 SDKs
Not including 14.1 and 14.3 as according to https://xcodereleases.com/
they were never released in any public Xcode version.

Did not re-assess min target version.
2024-06-19 15:15:17 +02:00
Dean M Greer
64d99dbb43
build.sh: Don’t build xar on Darwin
Using the macOS provided copy of xar avoids the need for openssl
2022-03-16 13:05:33 -04:00
Dean M Greer
90d3f9f248
tools.sh: remove Darwin workaround 2022-03-16 13:03:03 -04:00
6 changed files with 14 additions and 17 deletions

View File

@ -150,7 +150,7 @@ Changed:
Added: Added:
* binutils / gdb build script * binutils / gdb build script
* OSXCROSS_GCC_NO_STATIC_RUNTIME option (env) * OSXCROSS_GCC_NO_STATIC_RUNTIME option (env)
* osxcross-macports: A minimalistic macports packet manager * osxcross-macports: A minimalistic macports package manager
/******************************* v0.8 *******************************/ /******************************* v0.8 *******************************/

View File

@ -1,6 +1,6 @@
## OSXCROSS-MACPORTS ## ## OSXCROSS-MACPORTS ##
`osxcross-macports` is a small "packet manager" for 16.000+ binary MacPorts packages. `osxcross-macports` is a small "package manager" for 16.000+ binary MacPorts packages.
Packages are installed to `target/macports/pkgs`. Packages are installed to `target/macports/pkgs`.

View File

@ -44,9 +44,9 @@ Note: The "compiler-rt" library can be needed to link code that uses the
Basically everything you can build on macOS with clang/gcc should build with Basically everything you can build on macOS with clang/gcc should build with
this cross toolchain as well. this cross toolchain as well.
### PACKET MANAGERS ### ### PACKAGE MANAGERS ###
OSXCross comes with a minimalistic MacPorts Packet Manager. OSXCross comes with a minimalistic MacPorts Package Manager.
See [README.MACPORTS](README.MACPORTS.md) for more. See [README.MACPORTS](README.MACPORTS.md) for more.
### INSTALLATION: ### ### INSTALLATION: ###

View File

@ -54,6 +54,9 @@ case $SDK_VERSION in
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.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; ;; 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|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; ;;
*) echo "Unsupported SDK"; exit 1 ;; *) echo "Unsupported SDK"; exit 1 ;;
esac esac
@ -101,8 +104,9 @@ if [ "$SDK_VERSION" != "$OLD_SDK_VERSION" ]; then
fi fi
# XAR # XAR
if [[ $PLATFORM != Darwin ]]; then
build_xar build_xar
fi
# XAR END # XAR END
@ -137,7 +141,9 @@ if [ $f_res -eq 1 ]; then
if [ $NEED_TAPI_SUPPORT -eq 1 ]; then if [ $NEED_TAPI_SUPPORT -eq 1 ]; then
CONFFLAGS+="--with-libtapi=$TARGET_DIR " CONFFLAGS+="--with-libtapi=$TARGET_DIR "
fi fi
CONFFLAGS+="--with-libxar=$TARGET_DIR " if [[ $PLATFORM != Darwin ]]; then
CONFFLAGS+="--with-libxar=$TARGET_DIR "
fi
[ -n "$DISABLE_CLANG_AS" ] && CONFFLAGS+="--disable-clang-as " [ -n "$DISABLE_CLANG_AS" ] && CONFFLAGS+="--disable-clang-as "
[ -n "$DISABLE_LTO_SUPPORT" ] && CONFFLAGS+="--disable-lto-support " [ -n "$DISABLE_LTO_SUPPORT" ] && CONFFLAGS+="--disable-lto-support "
./configure $CONFFLAGS ./configure $CONFFLAGS

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
## ##
## A minimalistic MacPorts Packet Manager for OSXCross, ## A minimalistic MacPorts Package Manager for OSXCross,
## based on: https://github.com/maci0/pmmacports. ## based on: https://github.com/maci0/pmmacports.
## Please see README.MACPORTS for more. ## Please see README.MACPORTS for more.
## License: GPLv2. ## License: GPLv2.

View File

@ -50,15 +50,6 @@ if [[ $PLATFORM == CYGWIN* ]]; then
exit 1 exit 1
fi fi
if [[ $PLATFORM == Darwin ]]; then
echo $PATH
CFLAGS_OPENSSL="$(pkg-config --cflags openssl)"
LDFLAGS_OPENSSL="$(pkg-config --libs-only-L openssl)"
export C_INCLUDE_PATH=${CFLAGS_OPENSSL:2}
export CPLUS_INCLUDE_PATH=${CFLAGS_OPENSSL:2}
export LIBRARY_PATH=${LDFLAGS_OPENSSL:2}
fi
function require() function require()
{ {
if ! command -v $1 &>/dev/null; then if ! command -v $1 &>/dev/null; then