summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2014-06-12 15:18:22 +0000
committerJay Freeman <saurik@saurik.com>2014-06-12 15:18:22 +0000
commit1d6e262677a6d48454d3ab1ac1459a8c28898003 (patch)
tree4f4e9c63f3a93a08a5ec3cea73097c996faa65ef
parentdb2a3922e5ec7d588c6c04ec5220016af47c8bcd (diff)
Fix compilation of aptitude on current Telesphoreo.
git-svn-id: http://svn.telesphoreo.org/trunk@791 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--data/aptitude/make.sh2
-rwxr-xr-xutil/pkg-config.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/aptitude/make.sh b/data/aptitude/make.sh
index 2c972ac89..0846c54c6 100644
--- a/data/aptitude/make.sh
+++ b/data/aptitude/make.sh
@@ -1,6 +1,6 @@
shopt -s extglob
pkg:setup
pkg:configure
-pkg:make
+make AR="${PKG_TARG}-ar" CFLAGS='-O2 -mthumb'
pkg:install
rm -f "${PKG_DEST}"/usr/share/aptitude/!(aptitude-defaults|section-descriptions) #function_groups|function_pkgs
diff --git a/util/pkg-config.sh b/util/pkg-config.sh
index 22d2815b3..05c31677d 100755
--- a/util/pkg-config.sh
+++ b/util/pkg-config.sh
@@ -51,7 +51,7 @@ for pkg in "${pkgs[@]}"; do
DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
find "${DEP_DEST}" -name "${pkg}.pc" -printf "${DEP_DEST}\n"
- done) && args_=(--define-variable=prefix="${dest}/usr" "${args_[@]}")
+ done | head -n 1) && args_=(--define-variable=prefix="${dest}/usr" "${args_[@]}")
fi
#echo @@@ pkg-config "${args_[@]}" "${pkg}" 1>&2