TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-09 04:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix(iOS): apply script changes from jre17-21 branch

Browse Source
This commit is contained in:
khanhduytran0 2024-11-30 13:44:02 +00:00
parent c62cba0541
commit a3d27d75f4
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildjdk.sh
View File

@ -44,10 +44,10 @@ else
platform_args="--with-toolchain-type=clang SDKNAME=iphoneos" platform_args="--with-toolchain-type=clang SDKNAME=iphoneos"
# --disable-precompiled-headers # --disable-precompiled-headers
AUTOCONF_x11arg="--with-x=/opt/X11/include/X11 --prefix=/usr/lib" AUTOCONF_x11arg="--with-x=/opt/X11/include/X11 --prefix=/usr/lib"
sameflags="-arch arm64 -isysroot $thesysroot -miphoneos-version-min=14.0 -DHEADLESS=1 -I$PWD/ios-missing-include -Wno-implicit-function-declaration" sameflags="-arch arm64 -DHEADLESS=1 -I$PWD/ios-missing-include -Wno-implicit-function-declaration"
export CFLAGS+=" $sameflags" export CFLAGS+=" $sameflags"
export CXXFLAGS="$sameflags" export LDFLAGS+=" -arch arm64"
export LDFLAGS+=" -miphoneos-version-min=14.0" export BUILD_SYSROOT_CFLAGS="-isysroot ${themacsysroot}"
HOMEBREW_NO_AUTO_UPDATE=1 brew install ldid xquartz HOMEBREW_NO_AUTO_UPDATE=1 brew install ldid xquartz
fi fi

22
buildlibs.sh
View File

@ -5,25 +5,7 @@ cd freetype-$BUILD_FREETYPE_VERSION
echo "Building Freetype" echo "Building Freetype"
if [[ "$BUILD_IOS" == "1" ]]; then if [[ "$BUILD_IOS" != "1" ]]; then
LDFLAGS=-"arch arm64 -isysroot $thesysroot -miphoneos-version-min=12.0"
export CC=$thecc
export CXX=$thecxx
./configure \
--host=$TARGET \
--prefix=${PWD}/build_android-${TARGET_SHORT} \
--enable-shared=no --enable-static=yes \
--without-zlib \
--with-brotli=no \
--with-png=no \
--with-harfbuzz=no \
"CFLAGS=-arch arm64 -pipe -std=c99 -Wno-trigraphs -fpascal-strings -Os -Wreturn-type -Wunused-variable -fmessage-length=0 -fvisibility=hidden -miphoneos-version-min=12.0 -I$thesysroot/usr/include/libxml2/ -isysroot $thesysroot" \
AR=/usr/bin/ar \
"LDFLAGS=$LDFLAGS" \
|| error_code=$?
namefreetype=build_android-${TARGET_SHORT}/lib/libfreetype
else
export PATH=$TOOLCHAIN/bin:$PATH export PATH=$TOOLCHAIN/bin:$PATH
./configure \ ./configure \
--host=$TARGET \ --host=$TARGET \
@ -33,7 +15,6 @@ else
--with-png=no \ --with-png=no \
--with-harfbuzz=no $EXTRA_ARGS \ --with-harfbuzz=no $EXTRA_ARGS \
|| error_code=$? || error_code=$?
fi
if [[ "$error_code" -ne 0 ]]; then if [[ "$error_code" -ne 0 ]]; then
echo "\n\nCONFIGURE ERROR $error_code , config.log:" echo "\n\nCONFIGURE ERROR $error_code , config.log:"
cat config.log cat config.log
@ -46,3 +27,4 @@ make install
if [[ -f "${namefreetype}.a" ]]; then if [[ -f "${namefreetype}.a" ]]; then
clang -fPIC -shared $LDFLAGS -lbz2 -Wl,-all_load ${namefreetype}.a -o ${namefreetype}.dylib clang -fPIC -shared $LDFLAGS -lbz2 -Wl,-all_load ${namefreetype}.a -o ${namefreetype}.dylib
fi fi
fi

2
ios-arm64-clang
View File

@ -1 +1 @@
exec $thecc -arch arm64 -isysroot $thesysroot "$@" exec $thecc -arch arm64 -isysroot $thesysroot -miphoneos-version-min=14.0 "$@"

2
ios-arm64-clang++
View File

@ -1 +1 @@
exec $thecxx -arch arm64 -isysroot $thesysroot "$@" exec $thecxx -arch arm64 -isysroot $thesysroot -miphoneos-version-min=14.0 "$@"