Build environment changes

1 files changed, 25 insertions, 22 deletions

diff --git a/make.sh b/make.sh
index 914bc278b..57b6a6935 100755
--- a/make.sh
+++ b/make.sh
@@ -11,6 +11,8 @@ export PKG_MAKE=$0
 export PKG_NAME=${1%_}
 export PKG_BASE=$(realpath "$(dirname "$0")")
 
+export FAKEROOT=fakeroot
+
 . "${PKG_BASE}/helper.sh"
 
 if [[ ! -x ${PKG_BASE}/util/arid || ${PKG_BASE}/util/arid -ot ${PKG_BASE}/util/arid.cpp ]]; then
@@ -21,11 +23,11 @@ if [[ ! -x ${PKG_BASE}/util/ldid || ${PKG_BASE}/util/ldid -ot ${PKG_BASE}/util/l
     g++ -I ~/menes -o "${PKG_BASE}"/util/ldid{,.cpp} -x c "${PKG_BASE}"/util/{lookup2,sha1}.c
 fi
 
-export CODESIGN_ALLOCATE=$(which arm-apple-darwin9-codesign_allocate)
+export CODESIGN_ALLOCATE=$(which codesign_allocate)
 
-#for DEP_NAME in "${PKG_DEPS[@]}"; do
-#    "${PKG_MAKE}" "${DEP_NAME}"
-#done
+for DEP_NAME in "${PKG_DEPS[@]}"; do
+    "${PKG_MAKE}" "${DEP_NAME}"
+done
 
 export PKG_HASH=$({
     "${PKG_BASE}"/util/catdir.sh "${PKG_DATA}" -L \( -name '.svn' -o -name '_*' \) -prune -o
@@ -82,12 +84,12 @@ function pkg:bin() {
         popd
     fi
 
-    mkdir -p "${PKG_DEST}/bin"
+    ${FAKEROOT} mkdir -p "${PKG_DEST}/bin"
     for bin in "$@"; do
-        mv -v "${PKG_DEST}/usr/bin/${bin}" "${PKG_DEST}/bin/${bin}"
+        ${FAKEROOT} mv -v "${PKG_DEST}/usr/bin/${bin}" "${PKG_DEST}/bin/${bin}"
     done
 
-    rmdir --ignore-fail-on-non-empty -p "${PKG_DEST}/usr/bin"
+    ${FAKEROOT} rmdir --ignore-fail-on-non-empty -p "${PKG_DEST}/usr/bin"
 }
 
 export -f pkg:bin
@@ -97,13 +99,12 @@ function pkg:autoconf() {
         patch -F 3 -r/dev/null "${m4}" "${PKG_BASE}/util/libtool.m4.diff" || true
     done
 
-    autoconf
+		autoconf
 }
 
 export -f pkg:autoconf
 
 export PKG_CONF=./configure
-export PKG_MCPU=-mthumb
 
 function pkg:libtool_() {
     for ltmain in $(find -name "$1"); do
@@ -115,6 +116,10 @@ export -f pkg:libtool_
 
 function pkg:setup() {
     pkg:extract
+		if [ -z ""*/ ]; then
+			echo "Empty package??"
+			exit 1
+		fi
     cd */
     pkg:patch
 }
@@ -128,10 +133,10 @@ function pkg:configure() {
         --host="${PKG_TARG}" \
         --enable-static=no \
         --enable-shared=yes \
-        --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix") \
+        --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix") \
         --localstatedir="/var/cache/${PKG_NAME}" \
-        CFLAGS="-O2 ${PKG_MCPU} -fno-common" \
-        CXXFLAGS="-O2 ${PKG_MCPU} -fno-common" \
+        CFLAGS="-O2 ${PKG_MCPU} ${CFLAGS}" \
+        CXXFLAGS="-O2 ${PKG_MCPU} ${CXXFLAGS}" \
         "$@")
     echo "${cfg[@]}"
     PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
@@ -141,29 +146,27 @@ function pkg:configure() {
 export -f pkg:configure
 
 function pkg:make() {
-    make CC="${PKG_TARG}-gcc" CXX="${PKG_TARG}-g++" AR="${PKG_TARG}-ar" "$@"
+    make -j16 CC="${PKG_TARG}-gcc" CXX="${PKG_TARG}-g++" AR="${PKG_TARG}-ar" "$@"
 }
 
 export -f pkg:make
 
 function pkg:install() {
-    make install DESTDIR="${PKG_DEST}" "$@"
+    ${FAKEROOT} make install -j16 CC="${PKG_TARG}-gcc" CXX="${PKG_TARG}-g++" AR="${PKG_TARG}-ar" DESTDIR="${PKG_DEST}" "$@"
+    # Go die in a horrible fire, libtool
+    find "${PKG_DEST}" -name '*.la' -exec rm {} +
 }
 
 export -f pkg:install
 
 function pkg:extract() {
-    for tgz in "${PKG_DATA}"/*.{tar.gz,tgz}; do
-        tar -zxf "${tgz}"
+    for tgz in "${PKG_DATA}"/*.{tar.{gz,xz,bz2},tgz}; do
+        tar -xf "${tgz}"
     done
 
     for zip in "${PKG_DATA}"/*.zip; do
         unzip "${zip}"
     done
-
-    for tbz2 in "${PKG_DATA}"/*.tar.bz2; do
-        tar -jxf "${tbz2}"
-    done
 }
 
 export -f pkg:extract
@@ -204,8 +207,8 @@ rmdir_ "${PKG_DEST}/usr/local"
 rmdir_ "${PKG_DEST}/usr/lib"
 rmdir_ "${PKG_DEST}/usr"
 
-if [[ -e "${PKG_BASE}/arch/${PKG_ARCH}/strip" ]]; then
-    . "${PKG_BASE}/arch/${PKG_ARCH}/strip"
+if [[ -e "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/strip" ]]; then
+    . "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/strip"
 fi
 
 find "${PKG_DEST}" -type f -name '*.elc' -print0 | while read -r -d $'\0' bin; do