wok diff gcc+gcj/receipt @ rev 13878

libboost-dev, input-utils, gcc3, gcc+gcj, ffmpeg-svn, zsnes, zlib, nimrod, mtpaint: use $ARCH
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 15 11:21:28 2013 +0100 (2013-01-15)
parents 4c16797dce28
children 380ffe05937a
line diff
     1.1 --- a/gcc+gcj/receipt	Tue Jun 12 18:52:42 2012 +0200
     1.2 +++ b/gcc+gcj/receipt	Tue Jan 15 11:21:28 2013 +0100
     1.3 @@ -28,7 +28,7 @@
     1.4  	cd $src
     1.5  	# Set HOST_SYSTEM if not defined in tazwok.conf as it should be
     1.6  	if [ -z "$HOST_SYSTEM" ] ; then
     1.7 -		HOST_SYSTEM="i486-slitaz-linux"
     1.8 +		HOST_SYSTEM="$ARCH-slitaz-linux"
     1.9  	fi
    1.10  	GCC_TARGET=$HOST_SYSTEM
    1.11  
    1.12 @@ -58,7 +58,7 @@
    1.13  		--enable-languages=c,c++,objc,java --enable-shared \
    1.14  		--with-system-zlib \
    1.15  		--enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \
    1.16 -		--enable-threads=posix --with-tune=i486 \
    1.17 +		--enable-threads=posix --with-tune=$ARCH \
    1.18  		--enable-java-home --with-arch-directory=i386 \
    1.19  		--with-jvm-root-dir=/usr/lib/jvm/java-gcj \
    1.20  		--with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \
    1.21 @@ -77,18 +77,18 @@
    1.22  genpkg_rules()
    1.23  {
    1.24  	mkdir -p  $fs/usr/share
    1.25 -	cp -a $_pkg/usr/share/java $fs/usr/share
    1.26 -    cp -a $_pkg/usr/bin $fs/usr
    1.27 +	cp -a $install/usr/share/java $fs/usr/share
    1.28 +    cp -a $install/usr/bin $fs/usr
    1.29      # Copy all libs. Remove libgcc_s.so and libstdc++.so
    1.30      # they goes in gcc-lib-base-$VERSION package.
    1.31 -    cp -a $_pkg/usr/lib $fs/usr
    1.32 +    cp -a $install/usr/lib $fs/usr
    1.33      rm $fs/usr/lib/libgcc_s.so*
    1.34      rm $fs/usr/lib/libstdc++.so*
    1.35      rm $fs/usr/lib/libgomp.so*
    1.36      rm $fs/usr/lib/gcj-$VERSION-11/*.la
    1.37      rm $fs/usr/lib/*.la
    1.38      # Include files.
    1.39 -    cp -a $_pkg/usr/include $fs/usr
    1.40 +    cp -a $install/usr/include $fs/usr
    1.41  }
    1.42  
    1.43  # Post install commands for Tazpkg.