Fixes for the cydia static build of r2, needed for iOS12

This commit is contained in:
pancake 2019-08-22 18:56:57 +02:00
parent 7f9b8bdab3
commit 30a5d7ed2d
2 changed files with 15 additions and 7 deletions

View file

@ -4,6 +4,7 @@ STOW=0
fromscratch=1
onlydebug=0
onlymakedeb=0
static=1
if [ -z "${CPU}" ]; then
export CPU=arm64
@ -80,8 +81,14 @@ else
RV=0
else
make clean
./configure --prefix="${PREFIX}" --with-ostype=darwin --without-libuv \
--with-compiler=ios-sdk --target=arm-unknown-darwin
cp plugins.ios.cfg plugins.cfg
if [ "$static" = 1 ]; then
./configure --prefix="${PREFIX}" --with-ostype=darwin --without-libuv \
--with-compiler=ios-sdk --target=arm-unknown-darwin --with-libr
else
./configure --prefix="${PREFIX}" --with-ostype=darwin --without-libuv \
--with-compiler=ios-sdk --target=arm-unknown-darwin
fi
RV=$?
fi
else
@ -89,6 +96,10 @@ else
fi
if [ $RV = 0 ]; then
time make -j4
if [ "$static" = 1 ]; then
rm -f libr/*/*.dylib
( cd binr ; make clean ; make -j 4)
fi
if [ $? = 0 ]; then
makeDeb
fi

View file

@ -5,17 +5,14 @@ CWD="$(dirname "$0")"
[ -z "${IOSINC}" ] && IOSINC="${CWD}/ios-include"
CPUS=""
CPU=`echo $CPU | sed -e 's,+, ,g'`
EXTRA=""
for a in `IFS=+ echo ${CPU}` ; do
CPUS="-arch $a ${CPUS}"
done
[ -z "${SDK}" ] && SDK=iphoneos
APPLE_SDK=`echo ${SDK} |tr a-z A-Z`
CC="xcrun --sdk ${SDK} clang ${CPUS} -DAPPLE_SDK_${APPLE_SDK}=1 -I${IOSINC} ${EXTRA}"
CC="xcrun --sdk ${SDK} clang ${CPUS} -fembed-bitcode -DAPPLE_SDK_${APPLE_SDK}=1 -I${IOSINC} -miphoneos-version-min=10.0"
echo $CC $*
${CC} $*
r=$?
if [ "$r" != 0 ]; then
echo ${CC} $* >&2
fi
[ "$r" != 0 ] && echo ${CC} $* >&2
exit $r