|
|
@@ -1,4 +1,4 @@
|
|
|
-#!/bin/bash
|
|
|
+#!/bin/bash -x
|
|
|
|
|
|
BUILD_ROOT="$(pwd)"
|
|
|
ROOT_LOG_FOLDER="$BUILD_ROOT/Logs"
|
|
|
@@ -17,7 +17,7 @@ SDK_PATH="$(xcrun --sdk $PLATFORM_LOWER --show-sdk-path)"
|
|
|
SPEAK="true"
|
|
|
EXTRA_LD_FLAGS=""
|
|
|
HOST="aarch64"
|
|
|
-LOG_VERBOSE="verbose"
|
|
|
+LOG_VERBOSE=""
|
|
|
|
|
|
if [[ ! -d $ALREADY_BUILT ]]; then
|
|
|
mkdir -p $ALREADY_BUILT
|
|
|
@@ -165,7 +165,7 @@ buildProduct() {
|
|
|
fi
|
|
|
checkStatus $PKG_NAME $? "false"
|
|
|
sayIfVerbal "making $PKG_NAME"
|
|
|
- echo "\n\nPOST CONFIGURE\n\n" >> "$LOG_FILE"
|
|
|
+ echo -e "\n\nPOST CONFIGURE\n\n" >> "$LOG_FILE"
|
|
|
if [[ $LOG_VERBOSE == "verbose"* ]]; then
|
|
|
make -j8 DESTDIR="$SKEL_PREFIX" install | tee -a "${LOG_FILE}"
|
|
|
else
|
|
|
@@ -234,8 +234,8 @@ patchDpkg() {
|
|
|
buildBashAndFriends() {
|
|
|
notifyProgress "Building readline"
|
|
|
buildReadline
|
|
|
- notifyProgress "Building ncurses"
|
|
|
- buildNcurses
|
|
|
+ #notifyProgress "Building ncurses"
|
|
|
+ #buildNcurses
|
|
|
#notifyProgress "Building bash"
|
|
|
#buildBash
|
|
|
}
|
|
|
@@ -413,7 +413,7 @@ patchNcurses() {
|
|
|
PKG_NAME=$1
|
|
|
echo "patchNCurses PKG_NAME: $PKG_NAME"
|
|
|
if [[ "$PLATFORM" == "AppleTVOS" ]]; then
|
|
|
- #if [[ "$PKG_VERSION" == "6.0-1" ]]; then
|
|
|
+ if [[ "$PKG_VERSION" == "6.0-1" ]]; then
|
|
|
# LEFT ERROR ON environ)' no ;
|
|
|
# For some reason, building never fails on the error...
|
|
|
# But still, tput is in /usr/bin... so.... ??
|
|
|
@@ -430,31 +430,30 @@ patchNcurses() {
|
|
|
fixSystem "tput.patched.c"
|
|
|
cat progs/tput.c | tail -n 301 | sed 's/system(init_prog)/RunCmd(init_prog)/g' >> tput.patched.c
|
|
|
cp tput.patched.c progs/tput.c
|
|
|
- #fi
|
|
|
+ fi
|
|
|
fi
|
|
|
sed -i -- 's|#include <stdlib.h>|\n#if !defined(__arm64__)\n#define __arm64__\n#endif\n\n#include <stdlib.h>|' ncurses/build.priv.h
|
|
|
- #CURSES_PRIV="$SKEL_PREFIX/$ROOT_PREFIX/include/curses.priv.h"
|
|
|
- #FIFO="$SKEL_PREFIX/$ROOT_PREFIX/include/fifo_defs.h"
|
|
|
- #BUILD_P="$SKEL_PREFIX/$ROOT_PREFIX/include/build.priv.h"
|
|
|
- #if [[ ! -f "$CURSES_PRIV" ]]; then
|
|
|
- # cp $BUILD_ROOT/$1/ncurses/*.h "$SKEL_PREFIX/$ROOT_PREFIX/include/"
|
|
|
+ CURSES_PRIV="$SKEL_PREFIX/$ROOT_PREFIX/include/curses.priv.h"
|
|
|
+ FIFO="$SKEL_PREFIX/$ROOT_PREFIX/include/fifo_defs.h"
|
|
|
+ BUILD_P="$SKEL_PREFIX/$ROOT_PREFIX/include/build.priv.h"
|
|
|
+ if [[ ! -f "$CURSES_PRIV" ]]; then
|
|
|
+ cp $BUILD_ROOT/$1/ncurses/*.h "$SKEL_PREFIX/$ROOT_PREFIX/include/"
|
|
|
#cp "$BUILD_ROOT/$1/ncurses/fifo_defs.h" "$FIFO"
|
|
|
#cp "$BUILD_ROOT/$1/ncurses/build.priv.h" "$BUILD_P"
|
|
|
-
|
|
|
- #fi
|
|
|
+ fi
|
|
|
}
|
|
|
|
|
|
#https://git.elucubratus.com/elucubratus/elucubratus/-/raw/master/data/ncurses/ncurses_6.1+20181013.orig.tar.gz
|
|
|
|
|
|
buildNcurses() {
|
|
|
- PKG_NAME="ncurses-6.1-20181013"
|
|
|
+ PKG_NAME="ncurses-6.0"
|
|
|
checkBuilt $PKG_NAME
|
|
|
if [[ $? != 0 ]]; then
|
|
|
echo "$PKG_NAME already exists, skipping!"
|
|
|
else
|
|
|
echo "building $PKG_NAME..."
|
|
|
splitName $PKG_NAME
|
|
|
- downloadProduct https://git.elucubratus.com/elucubratus/elucubratus/-/raw/master/data/ncurses/ncurses_6.1+20181013.orig.tar.gz - $RAW_NAME $VERSION
|
|
|
+ downloadProduct http://gnu.mirror.constant.com/ncurses/ncurses-6.0.tar.gz http://gnu.mirror.constant.com/ncurses/ncurses-6.0.tar.gz.sig $RAW_NAME $VERSION
|
|
|
patchNcurses $PKG_NAME
|
|
|
buildProduct $PKG_NAME
|
|
|
fi
|
|
|
@@ -818,6 +817,7 @@ downloadOpenSSL() {
|
|
|
}
|
|
|
|
|
|
buildOpenSSL() {
|
|
|
+ PKG_NAME="openssl"
|
|
|
checkBuilt $PKG_NAME
|
|
|
if [[ $? != 0 ]]; then
|
|
|
echo "$PKG_NAME already exists, skipping!"
|
|
|
@@ -840,7 +840,7 @@ buildOpenSSL() {
|
|
|
(./Configure ios64-cross no-dso no-hw no-engine --prefix="/$ROOT_PREFIX" > "$LOG_FILE" 2>&1)
|
|
|
fi
|
|
|
checkStatus $PKG_NAME $? "false"
|
|
|
- echo "\n\nPOST CONFIGURE\n\n" >> "$LOG_FILE"
|
|
|
+ echo -e "\n\nPOST CONFIGURE\n\n" >> "$LOG_FILE"
|
|
|
sayIfVerbal "making openSSL"
|
|
|
if [[ $LOG_VERBOSE == "verbose"* ]]; then
|
|
|
make DESTDIR="$SKEL_PREFIX" install | tee -a "${LOG_FILE}"
|
|
|
@@ -1243,7 +1243,7 @@ mkdirIfNecessary $ROOT_LOG_FOLDER
|
|
|
# Ensure our SDK has all the required "extras" installed/setup
|
|
|
prepSDK
|
|
|
|
|
|
-#buildBashAndFriends
|
|
|
+buildBashAndFriends
|
|
|
buildBasicUtils
|
|
|
buildDPKGAndDependencies
|
|
|
buildAPTAndDependencies
|