wok-stable rev 4034

Fix: H8/300 cross-toolchain hierarchy
author Matthew Sheets <rcx@zoominternet.net>
date Mon Sep 07 17:14:24 2009 +0000 (2009-09-07)
parents a07d891b9ff3
children df32eed71d9b
files h8300-binutils/receipt h8300-gcc/receipt h8300-gcc3/receipt h8300-gdb/receipt h8300-toolchain/receipt h8300-toolchain/stuff/h8300.conf
line diff
     1.1 --- a/h8300-binutils/receipt	Mon Sep 07 16:53:32 2009 +0000
     1.2 +++ b/h8300-binutils/receipt	Mon Sep 07 17:14:24 2009 +0000
     1.3 @@ -4,7 +4,7 @@
     1.4  SOURCE="binutils"
     1.5  VERSION="2.16.1"
     1.6  CATEGORY="development"
     1.7 -SHORT_DESC="binutils targeting the H8/300"
     1.8 +SHORT_DESC="binutils targeting the H8/300."
     1.9  MAINTAINER="rcx@zoominternet.net"
    1.10  DEPENDS=""
    1.11  BUILD_DEPENDS="slitaz-toolchain bison flex"
    1.12 @@ -12,29 +12,33 @@
    1.13  WEB_SITE="http://www.gnu.org/software/binutils/"
    1.14  WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
    1.15  
    1.16 +# Configuration only needs included if we're in the build/wok environment
    1.17 +if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
    1.18 +	. $WOK/h8300-toolchain/stuff/h8300.conf
    1.19 +fi
    1.20 +
    1.21  # Rules to configure and make the package.
    1.22  compile_rules()
    1.23  {
    1.24  	cd $src
    1.25  	./configure \
    1.26 -		--target=h8300-hitachi-hms \
    1.27 +		--target=$H8300_TARGET \
    1.28  		--prefix=/usr \
    1.29  		--disable-nls \
    1.30 -		--exec-prefix=/usr \
    1.31 -		--libexecdir=/usr/lib \
    1.32  		--infodir=/usr/share/info \
    1.33  		--mandir=/usr/share/man \
    1.34  		$CONFIGURE_ARGS &&
    1.35  	make &&
    1.36 -	make DESTDIR=$PWD/_pkg install
    1.37 +	make DESTDIR=$src/_pkg install
    1.38  }
    1.39  
    1.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.41  genpkg_rules()
    1.42  {
    1.43 -	mkdir -p $fs/usr
    1.44 +	mkdir -p $fs/usr $fs$H8300_ROOT
    1.45  	cp -a $_pkg/usr/bin $fs/usr
    1.46 -	cp -a $_pkg/usr/lib $fs/usr
    1.47 +	cp -a $_pkg/usr/$H8300_TARGET/* $fs$H8300_ROOT
    1.48  	# do not need to copy lib/libiberty.a
    1.49 -	rm -f $fs/usr/lib/libiberty.a
    1.50 +	
    1.51 +	strip -s $fs$H8300_ROOT/bin/*
    1.52  }
     2.1 --- a/h8300-gcc/receipt	Mon Sep 07 16:53:32 2009 +0000
     2.2 +++ b/h8300-gcc/receipt	Mon Sep 07 17:14:24 2009 +0000
     2.3 @@ -12,6 +12,11 @@
     2.4  WEB_SITE="http://www.gnu.org/software/gcc/"
     2.5  WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
     2.6  
     2.7 +# Configuration only needs included if we're in the build/wok environment
     2.8 +if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
     2.9 +	. $WOK/h8300-toolchain/stuff/h8300.conf
    2.10 +fi
    2.11 +
    2.12  # Rules to configure and make the package.
    2.13  compile_rules()
    2.14  {
    2.15 @@ -19,13 +24,12 @@
    2.16  	mkdir -p $SOURCE-$VERSION-build
    2.17  	cd $SOURCE-$VERSION-build
    2.18  	$src/configure \
    2.19 -		--target=h8300-hitachi-hms \
    2.20 +		--target=$H8300_TARGET \
    2.21  		--enable-languages=c,c++ \
    2.22  		--disable-nls \
    2.23  		--enable-target-optspace \
    2.24  		--enable-obsolete \
    2.25  		--prefix=/usr \
    2.26 -		--exec-prefix=/usr \
    2.27  		--libexecdir=/usr/lib \
    2.28  		--infodir=/usr/share/info \
    2.29  		--mandir=/usr/share/man \
    2.30 @@ -43,6 +47,10 @@
    2.31  	# do not need to copy lib/libiberty.a
    2.32  	mkdir -p $fs/usr/lib
    2.33  	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
    2.34 +	# Do not include the h8* variant folders; create separate packages if they are needed
    2.35 +	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300h
    2.36 +	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300s
    2.37 +	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8sx
    2.38  }
    2.39  
    2.40  # Rules to clean the package
     3.1 --- a/h8300-gcc3/receipt	Mon Sep 07 16:53:32 2009 +0000
     3.2 +++ b/h8300-gcc3/receipt	Mon Sep 07 17:14:24 2009 +0000
     3.3 @@ -13,6 +13,11 @@
     3.4  WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
     3.5  PROVIDE="h8300-gcc"
     3.6  
     3.7 +# Configuration only needs included if we're in the build/wok environment
     3.8 +if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
     3.9 +	. $WOK/h8300-toolchain/stuff/h8300.conf
    3.10 +fi
    3.11 +
    3.12  # Rules to configure and make the package.
    3.13  compile_rules()
    3.14  {
    3.15 @@ -20,12 +25,11 @@
    3.16  	mkdir -p $SOURCE-$VERSION-build
    3.17  	cd $SOURCE-$VERSION-build
    3.18  	$src/configure \
    3.19 -		--target=h8300-hitachi-hms \
    3.20 +		--target=$H8300_TARGET \
    3.21  		--enable-languages=c,c++,ada \
    3.22  		--disable-nls \
    3.23  		--enable-target-optspace \
    3.24  		--prefix=/usr \
    3.25 -		--exec-prefix=/usr \
    3.26  		--libexecdir=/usr/lib \
    3.27  		--infodir=/usr/share/info \
    3.28  		--mandir=/usr/share/man \
    3.29 @@ -40,9 +44,12 @@
    3.30  	mkdir -p $fs/usr
    3.31  	cp -a $_pkg/usr/bin $fs/usr
    3.32  	cp -a $_pkg/usr/include $fs/usr
    3.33 -	# do not need to copy lib/libiberty.a
    3.34 +	# Do not need to copy lib/libiberty.a
    3.35  	mkdir -p $fs/usr/lib
    3.36  	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
    3.37 +	# Do not include the h8300* variant folders; create separate packages if they are needed
    3.38 +	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300h
    3.39 +	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300s
    3.40  }
    3.41  
    3.42  # Rules to clean the package
     4.1 --- a/h8300-gdb/receipt	Mon Sep 07 16:53:32 2009 +0000
     4.2 +++ b/h8300-gdb/receipt	Mon Sep 07 17:14:24 2009 +0000
     4.3 @@ -12,13 +12,19 @@
     4.4  WEB_SITE="http://www.gnu.org/software/gdb/"
     4.5  WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
     4.6  
     4.7 +# Configuration only needs included if we're in the build/wok environment
     4.8 +if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
     4.9 +	. $WOK/h8300-toolchain/stuff/h8300.conf
    4.10 +fi
    4.11 +
    4.12  # Rules to configure and make the package.
    4.13  compile_rules()
    4.14  {
    4.15 -	mkdir -p $src-build
    4.16 -	cd $src-build
    4.17 +	mkdir -p $SOURCE-$VERSION-build
    4.18 +	cd $SOURCE-$VERSION-build
    4.19  	$src/configure \
    4.20 -		--target=h8300-hitachi-hms \
    4.21 +		--disable-werror \
    4.22 +		--target=$H8300_TARGET \
    4.23  		--prefix=/usr \
    4.24  		--infodir=/usr/share/info \
    4.25  		--mandir=/usr/share/man \
    4.26 @@ -33,3 +39,9 @@
    4.27  	mkdir -p $fs/usr
    4.28  	cp -a $_pkg/usr/bin $fs/usr
    4.29  }
    4.30 +
    4.31 +# Rules to clean the package
    4.32 +clean_wok()
    4.33 +{
    4.34 +	rm -r -f $SOURCE-$VERSION-build
    4.35 +}
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/h8300-toolchain/receipt	Mon Sep 07 17:14:24 2009 +0000
     5.3 @@ -0,0 +1,15 @@
     5.4 +# SliTaz package receipt.
     5.5 +
     5.6 +PACKAGE="h8300-toolchain"
     5.7 +VERSION="1.0"
     5.8 +CATEGORY="meta"
     5.9 +SHORT_DESC="H8/300 toolchain meta package for devel."
    5.10 +MAINTAINER="rcx@zoominternet.net"
    5.11 +DEPENDS="h8300-gcc"
    5.12 +WEB_SITE="http://www.slitaz.org/"
    5.13 +
    5.14 +# Rules to gen a SliTaz package suitable for Tazpkg.
    5.15 +genpkg_rules()
    5.16 +{
    5.17 +	mkdir -p $fs/var
    5.18 +}
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/h8300-toolchain/stuff/h8300.conf	Mon Sep 07 17:14:24 2009 +0000
     6.3 @@ -0,0 +1,6 @@
     6.4 +
     6.5 +H8300_TARGET="h8300-hitachi-hms"
     6.6 +H8300_ROOT="/usr/$H8300_TARGET"
     6.7 +
     6.8 +# Need exception for FSH incompleteness
     6.9 +FSH="$FSH $H8300_ROOT"