# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1252343664 0
# Node ID 57411a44bf6966e43b8ff5a9513f8eebed070e85
# Parent  a07d891b9ff3dd14c554b7298eeff6ea4c9ea007
Fix: H8/300 cross-toolchain hierarchy

diff -r a07d891b9ff3 -r 57411a44bf69 h8300-binutils/receipt
--- a/h8300-binutils/receipt	Mon Sep 07 16:53:32 2009 +0000
+++ b/h8300-binutils/receipt	Mon Sep 07 17:14:24 2009 +0000
@@ -4,7 +4,7 @@
 SOURCE="binutils"
 VERSION="2.16.1"
 CATEGORY="development"
-SHORT_DESC="binutils targeting the H8/300"
+SHORT_DESC="binutils targeting the H8/300."
 MAINTAINER="rcx@zoominternet.net"
 DEPENDS=""
 BUILD_DEPENDS="slitaz-toolchain bison flex"
@@ -12,29 +12,33 @@
 WEB_SITE="http://www.gnu.org/software/binutils/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
 
+# Configuration only needs included if we're in the build/wok environment
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+	. $WOK/h8300-toolchain/stuff/h8300.conf
+fi
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
 	./configure \
-		--target=h8300-hitachi-hms \
+		--target=$H8300_TARGET \
 		--prefix=/usr \
 		--disable-nls \
-		--exec-prefix=/usr \
-		--libexecdir=/usr/lib \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$src/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr $fs$H8300_ROOT
 	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
+	cp -a $_pkg/usr/$H8300_TARGET/* $fs$H8300_ROOT
 	# do not need to copy lib/libiberty.a
-	rm -f $fs/usr/lib/libiberty.a
+	
+	strip -s $fs$H8300_ROOT/bin/*
 }
diff -r a07d891b9ff3 -r 57411a44bf69 h8300-gcc/receipt
--- a/h8300-gcc/receipt	Mon Sep 07 16:53:32 2009 +0000
+++ b/h8300-gcc/receipt	Mon Sep 07 17:14:24 2009 +0000
@@ -12,6 +12,11 @@
 WEB_SITE="http://www.gnu.org/software/gcc/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
 
+# Configuration only needs included if we're in the build/wok environment
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+	. $WOK/h8300-toolchain/stuff/h8300.conf
+fi
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -19,13 +24,12 @@
 	mkdir -p $SOURCE-$VERSION-build
 	cd $SOURCE-$VERSION-build
 	$src/configure \
-		--target=h8300-hitachi-hms \
+		--target=$H8300_TARGET \
 		--enable-languages=c,c++ \
 		--disable-nls \
 		--enable-target-optspace \
 		--enable-obsolete \
 		--prefix=/usr \
-		--exec-prefix=/usr \
 		--libexecdir=/usr/lib \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
@@ -43,6 +47,10 @@
 	# do not need to copy lib/libiberty.a
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
+	# Do not include the h8* variant folders; create separate packages if they are needed
+	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300h
+	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300s
+	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8sx
 }
 
 # Rules to clean the package
diff -r a07d891b9ff3 -r 57411a44bf69 h8300-gcc3/receipt
--- a/h8300-gcc3/receipt	Mon Sep 07 16:53:32 2009 +0000
+++ b/h8300-gcc3/receipt	Mon Sep 07 17:14:24 2009 +0000
@@ -13,6 +13,11 @@
 WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
 PROVIDE="h8300-gcc"
 
+# Configuration only needs included if we're in the build/wok environment
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+	. $WOK/h8300-toolchain/stuff/h8300.conf
+fi
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -20,12 +25,11 @@
 	mkdir -p $SOURCE-$VERSION-build
 	cd $SOURCE-$VERSION-build
 	$src/configure \
-		--target=h8300-hitachi-hms \
+		--target=$H8300_TARGET \
 		--enable-languages=c,c++,ada \
 		--disable-nls \
 		--enable-target-optspace \
 		--prefix=/usr \
-		--exec-prefix=/usr \
 		--libexecdir=/usr/lib \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
@@ -40,9 +44,12 @@
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/include $fs/usr
-	# do not need to copy lib/libiberty.a
+	# Do not need to copy lib/libiberty.a
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
+	# Do not include the h8300* variant folders; create separate packages if they are needed
+	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300h
+	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300s
 }
 
 # Rules to clean the package
diff -r a07d891b9ff3 -r 57411a44bf69 h8300-gdb/receipt
--- a/h8300-gdb/receipt	Mon Sep 07 16:53:32 2009 +0000
+++ b/h8300-gdb/receipt	Mon Sep 07 17:14:24 2009 +0000
@@ -12,13 +12,19 @@
 WEB_SITE="http://www.gnu.org/software/gdb/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
 
+# Configuration only needs included if we're in the build/wok environment
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+	. $WOK/h8300-toolchain/stuff/h8300.conf
+fi
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	mkdir -p $src-build
-	cd $src-build
+	mkdir -p $SOURCE-$VERSION-build
+	cd $SOURCE-$VERSION-build
 	$src/configure \
-		--target=h8300-hitachi-hms \
+		--disable-werror \
+		--target=$H8300_TARGET \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
@@ -33,3 +39,9 @@
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/bin $fs/usr
 }
+
+# Rules to clean the package
+clean_wok()
+{
+	rm -r -f $SOURCE-$VERSION-build
+}
diff -r a07d891b9ff3 -r 57411a44bf69 h8300-toolchain/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/h8300-toolchain/receipt	Mon Sep 07 17:14:24 2009 +0000
@@ -0,0 +1,15 @@
+# SliTaz package receipt.
+
+PACKAGE="h8300-toolchain"
+VERSION="1.0"
+CATEGORY="meta"
+SHORT_DESC="H8/300 toolchain meta package for devel."
+MAINTAINER="rcx@zoominternet.net"
+DEPENDS="h8300-gcc"
+WEB_SITE="http://www.slitaz.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/var
+}
diff -r a07d891b9ff3 -r 57411a44bf69 h8300-toolchain/stuff/h8300.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/h8300-toolchain/stuff/h8300.conf	Mon Sep 07 17:14:24 2009 +0000
@@ -0,0 +1,6 @@
+
+H8300_TARGET="h8300-hitachi-hms"
+H8300_ROOT="/usr/$H8300_TARGET"
+
+# Need exception for FSH incompleteness
+FSH="$FSH $H8300_ROOT"