From c6f15699aa06f450985c3d67441bfb7250c65e57 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Tue, 13 Aug 2013 19:24:35 +0000
Subject: [PATCH] Modified pkg*-cross scripts and pkgmk-cross.conf for being
 compatible with upstream branch sources. Also performed switch to hardfp
 mainline in pkgmk-cross.conf

---
 pkgadd-cross     |  6 +++---
 pkginfo-cross    |  4 ++--
 pkgmk-cross      |  4 ++--
 pkgmk-cross.conf | 28 ++++++++++++++++++----------
 pkgrm-cross      |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/pkgadd-cross b/pkgadd-cross
index c3dd96e..1686171 100755
--- a/pkgadd-cross
+++ b/pkgadd-cross
@@ -2,9 +2,9 @@
 
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
-PKGADD=$TOPDIR/src/pkgadd
-PKGADD_CONF=$TOPDIR/src/pkgadd.conf
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGADD=$TOPDIR/pkgadd
+PKGADD_CONF=$TOPDIR/pkgadd.conf
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
 
 if [ -z "$CLFS" ]; then
diff --git a/pkginfo-cross b/pkginfo-cross
index 3054c3a..4b2d359 100755
--- a/pkginfo-cross
+++ b/pkginfo-cross
@@ -2,9 +2,9 @@
 
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
-PKGINFO=$TOPDIR/pkginfo
+PKGINFO=$TOPDIR/pkgadd
 
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
 
 if [ -z "$CLFS" ]; then
diff --git a/pkgmk-cross b/pkgmk-cross
index f5ecafc..a3c64ba 100755
--- a/pkgmk-cross
+++ b/pkgmk-cross
@@ -3,8 +3,8 @@
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 TMP_CONF="$(mktemp)"
 
-PKGMK=$TOPDIR/src/pkgmk
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGMK=$TOPDIR/pkgmk
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 PKGMK_ARGS=""
 PKGMK_OPTIMIZE=""
 
diff --git a/pkgmk-cross.conf b/pkgmk-cross.conf
index 06bc64b..4371a82 100644
--- a/pkgmk-cross.conf
+++ b/pkgmk-cross.conf
@@ -4,13 +4,16 @@
 
 export CHOST="$(echo $MACHTYPE)"
 
-export CTARGET="arm-crux-linux-gnueabi"
+# hardfp (mainline)
+export CTARGET="arm-crux-linux-gnueabihf"
 export CLFS="/devel/crux-arm/toolchain/clfs"
 export CROSSTOOLS="/devel/crux-arm/toolchain/crosstools"
-# hardfp
-#export CTARGET="arm-crux-linux-gnueabihf"
-#export CLFS="/devel/crux-arm/toolchain-hardfp/clfs"
-#export CROSSTOOLS="/devel/crux-arm/toolchain-hardfp/crosstools"
+#
+# softfp
+#export CTARGET="arm-crux-linux-gnueabi"
+#export CLFS="/devel/crux-arm/toolchain-softfp/clfs"
+#export CROSSTOOLS="/devel/crux-arm/toolchain-softfp/crosstools"
+#
 # noeabi
 #export CTARGET="arm-crux-linux-gnu"
 #export CLFS="/devel/crux-arm/toolchain-noeabi/clfs"
@@ -27,16 +30,20 @@ export RANLIB="$CTARGET-ranlib"
 export LD="$CTARGET-ld"
 export STRIP="$CTARGET-strip"
 
-export CFLAGS="-O2 -pipe -mno-unaligned-access"
-# hardfp
-#export CFLAGS="-O2 -pipe -mno-unaligned-access -mfloat-abi=hard"
-export CXXFLAGS="$CFLAGS"
-
+# hardfp (mainline)
+export CFLAGS="-O2 -pipe -mno-unaligned-access -mfloat-abi=hard"
+#
+# softfp
+#export CFLAGS="-O2 -pipe -mno-unaligned-access"
+#
+# device optimizations (not really required if you can use native builds)
 #arm9tdmi_CFLAGS="-O2 -pipe -march=armv4 -mtune=arm9tdmi"
 #armv5te_CFLAGS="-O2 -pipe -msoft-float -march=armv5te"
 #strongarm_CFLAGS="-O2 -pipe -march=armv4 -mtune=strongarm"
 #xscale_CFLAGS="-O2 -pipe -msoft-float -march=armv5te -mtune=xscale"
 
+export CXXFLAGS="$CFLAGS"
+
 STRIP_CMD="$STRIP"
 
 # PKGMK_SOURCE_MIRRORS=()
@@ -47,5 +54,6 @@ STRIP_CMD="$STRIP"
 # PKGMK_IGNORE_FOOTPRINT="no"
 # PKGMK_NO_STRIP="no"
 # PKGMK_WGET_OPTS=""
+PKGMK_COMPRESSION_MODE="xz"
 
 # End of file
diff --git a/pkgrm-cross b/pkgrm-cross
index 6d21f85..835190e 100755
--- a/pkgrm-cross
+++ b/pkgrm-cross
@@ -4,7 +4,7 @@ TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
 PKGRM=$TOPDIR/pkgadd
 
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
 
 if [ -z "$CLFS" ]; then
-- 
2.26.2