diff options
author | Zach van Rijn <me@zv.io> | 2021-10-09 21:04:03 -0500 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2022-12-05 01:54:29 -0600 |
commit | 8f39b6179b815008f6cbb96455e0462045322320 (patch) | |
tree | 4cebd614ded1ea3476a4e7cb3e21c8f56dd39167 /scripts/patches/0001-extra-lib-paths.diff | |
parent | 198e0130d845f7466c09a61f3829905d95313c06 (diff) | |
download | packages-8f39b6179b815008f6cbb96455e0462045322320.tar.gz packages-8f39b6179b815008f6cbb96455e0462045322320.tar.bz2 packages-8f39b6179b815008f6cbb96455e0462045322320.tar.xz packages-8f39b6179b815008f6cbb96455e0462045322320.zip |
Initial draft of new bootstrap tooling.
Diffstat (limited to 'scripts/patches/0001-extra-lib-paths.diff')
-rw-r--r-- | scripts/patches/0001-extra-lib-paths.diff | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/scripts/patches/0001-extra-lib-paths.diff b/scripts/patches/0001-extra-lib-paths.diff new file mode 100644 index 000000000..2dfb49e4e --- /dev/null +++ b/scripts/patches/0001-extra-lib-paths.diff @@ -0,0 +1,20 @@ +--- a 2021-10-09 20:59:28.977394444 -0500 ++++ b 2021-10-09 21:00:09.470414858 -0500 +@@ -1363,7 +1363,7 @@ + local rpaths=$(cat "$1") + shift + while [ $# -gt 0 ]; do +- real_so_path "$1" /usr/lib /lib $rpaths || return 1 ++ real_so_path "$1" /usr/lib /lib $(ldd /tmp/m32/host/bin/gcc | grep -oE '/.*\ ' | xargs -I {} dirname {} | sort | uniq) $rpaths || return 1 + shift + done + return 0 +@@ -1396,7 +1396,7 @@ + local apkroot= + + case "$parch" in +- $CBUILD_ARCH) ;; ++ $CBUILD_ARCH) apkroot="--root $CBUILDROOT" ;; + $CARCH | $CTARGET_ARCH) apkroot="--root $CBUILDROOT --arch $CTARGET_ARCH" ;; + esac + |