diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/catdir.sh | 2 | ||||
| -rwxr-xr-x | util/collect2 | 10 | ||||
| -rwxr-xr-x | util/configure.sh | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/util/catdir.sh b/util/catdir.sh index b23b94125..19dfd2461 100755 --- a/util/catdir.sh +++ b/util/catdir.sh @@ -1,3 +1,5 @@ #!/bin/bash +cd "$1" +shift find -H "$@" -type l -printf '%p -> %l\n' -o -printf '%p (%U/%G/%#m)\n' | sort find -H "$@" -type f -print0 | sort -z | xargs -0 cat diff --git a/util/collect2 b/util/collect2 index 30cacb773..864805335 100755 --- a/util/collect2 +++ b/util/collect2 @@ -37,10 +37,16 @@ if [[ "${darwin+@}" ]]; then flags[${#flags[@]}]=-no_uuid if [[ "${PKG_PATH+@}" ]]; then - flags=("${flags[@]}"$(echo "${PKG_PATH}:" | while read -r -d ':' path; do + flags=("${flags[@]}"$({ + echo "${PKG_PATH}" | tr ':' $'\n' + + for DEP_NAME in libgcc sqlite3; do + echo "$(PKG_DEST_ "${DEP_NAME}")" + done + } | while read -r path; do find "${path}" -name '*.dylib' -print0 | while read -r -d $'\0' dylib_file; do dylib_name=${dylib_file#${path}} - echo " -dylib_file ${dylib_name}:${dylib_file}" + echo -n " -dylib_file ${dylib_name}:${dylib_file}" done done)) fi diff --git a/util/configure.sh b/util/configure.sh index 162ea207c..396c6f59b 100755 --- a/util/configure.sh +++ b/util/configure.sh @@ -7,4 +7,4 @@ if [[ -z $PKG_CONF ]]; then PKG_CONF=./configure fi -PKG_ROOT=/home/saurik/iphone/sysroot PKG_CONFIG="$(realpath ../../../util/pkg-config.sh) --define-variable=prefix=/home/saurik/iphone/sysroot/usr" PKG_CONFIG_PATH=/home/saurik/iphone/sysroot/usr/lib/pkgconfig $PKG_CONF --prefix=/usr --host=arm-apple-darwin8 --enable-static=no --enable-shared=yes "$@" +PKG_ROOT=/home/saurik/iphone/sysroot PKG_CONFIG="$(realpath ../../../util/pkg-config.sh) --define-variable=prefix=/home/saurik/iphone/sysroot/usr" PKG_CONFIG_PATH=/home/saurik/iphone/sysroot/usr/lib/pkgconfig $PKG_CONF --prefix=/usr --host=arm-apple-darwin9 --enable-static=no --enable-shared=yes "$@" |