wok 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 | 72a16f6d46c2 |
| children | 4fd8473c8682 |
| files | ffmpeg-svn/receipt gcc+gcj/receipt gcc3/receipt input-utils/receipt libboost-dev/receipt mtpaint/receipt nimrod/receipt zsnes/receipt |
line diff
1.1 --- a/ffmpeg-svn/receipt Tue Jan 15 11:06:23 2013 +0100 1.2 +++ b/ffmpeg-svn/receipt Tue Jan 15 11:21:28 2013 +0100 1.3 @@ -26,8 +26,8 @@ 1.4 ./configure \ 1.5 --prefix=/usr \ 1.6 --enable-gpl \ 1.7 - --arch=i486 \ 1.8 - --cpu=i486 \ 1.9 + --arch=$ARCH \ 1.10 + --cpu=$ARCH \ 1.11 --enable-shared \ 1.12 --enable-small \ 1.13 --enable-pthreads \ 1.14 @@ -36,15 +36,15 @@ 1.15 --disable-mmx2 \ 1.16 --disable-ssse3 && 1.17 make && 1.18 - make DESTDIR=$PWD/_pkg install 1.19 + make DESTDIR=$DESTDIR install 1.20 } 1.21 1.22 # Rules to gen a SliTaz package suitable for Tazpkg. 1.23 genpkg_rules() 1.24 { 1.25 mkdir -p $fs/usr/lib 1.26 - cp -a $_pkg/usr/lib/*so* $fs/usr/lib 1.27 - cp -a $_pkg/usr/bin $fs/usr 1.28 + cp -a $install/usr/lib/*so* $fs/usr/lib 1.29 + cp -a $install/usr/bin $fs/usr 1.30 # ffplay with it SDL dep go in a splited package 1.31 rm $fs/usr/bin/ffplay 1.32 }
2.1 --- a/gcc+gcj/receipt Tue Jan 15 11:06:23 2013 +0100 2.2 +++ b/gcc+gcj/receipt Tue Jan 15 11:21:28 2013 +0100 2.3 @@ -28,7 +28,7 @@ 2.4 cd $src 2.5 # Set HOST_SYSTEM if not defined in tazwok.conf as it should be 2.6 if [ -z "$HOST_SYSTEM" ] ; then 2.7 - HOST_SYSTEM="i486-slitaz-linux" 2.8 + HOST_SYSTEM="$ARCH-slitaz-linux" 2.9 fi 2.10 GCC_TARGET=$HOST_SYSTEM 2.11 2.12 @@ -58,7 +58,7 @@ 2.13 --enable-languages=c,c++,objc,java --enable-shared \ 2.14 --with-system-zlib \ 2.15 --enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \ 2.16 - --enable-threads=posix --with-tune=i486 \ 2.17 + --enable-threads=posix --with-tune=$ARCH \ 2.18 --enable-java-home --with-arch-directory=i386 \ 2.19 --with-jvm-root-dir=/usr/lib/jvm/java-gcj \ 2.20 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \ 2.21 @@ -77,18 +77,18 @@ 2.22 genpkg_rules() 2.23 { 2.24 mkdir -p $fs/usr/share 2.25 - cp -a $_pkg/usr/share/java $fs/usr/share 2.26 - cp -a $_pkg/usr/bin $fs/usr 2.27 + cp -a $install/usr/share/java $fs/usr/share 2.28 + cp -a $install/usr/bin $fs/usr 2.29 # Copy all libs. Remove libgcc_s.so and libstdc++.so 2.30 # they goes in gcc-lib-base-$VERSION package. 2.31 - cp -a $_pkg/usr/lib $fs/usr 2.32 + cp -a $install/usr/lib $fs/usr 2.33 rm $fs/usr/lib/libgcc_s.so* 2.34 rm $fs/usr/lib/libstdc++.so* 2.35 rm $fs/usr/lib/libgomp.so* 2.36 rm $fs/usr/lib/gcj-$VERSION-11/*.la 2.37 rm $fs/usr/lib/*.la 2.38 # Include files. 2.39 - cp -a $_pkg/usr/include $fs/usr 2.40 + cp -a $install/usr/include $fs/usr 2.41 } 2.42 2.43 # Post install commands for Tazpkg.
3.1 --- a/gcc3/receipt Tue Jan 15 11:06:23 2013 +0100 3.2 +++ b/gcc3/receipt Tue Jan 15 11:21:28 2013 +0100 3.3 @@ -24,7 +24,7 @@ 3.4 --infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \ 3.5 --enable-languages=c,c++ --enable-shared --with-system-zlib \ 3.6 --enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \ 3.7 - --enable-threads=posix --with-tune=i486 \ 3.8 + --enable-threads=posix --with-tune=$ARCH \ 3.9 --program-suffix=-3 3.10 make $MAKEFLAGS bootstrap 3.11 # Make install in the source tree to help creating derivated pkgs
4.1 --- a/input-utils/receipt Tue Jan 15 11:06:23 2013 +0100 4.2 +++ b/input-utils/receipt Tue Jan 15 11:21:28 2013 +0100 4.3 @@ -18,15 +18,15 @@ 4.4 cd $src 4.5 sed -i 's/input-recv lircd.conf/input-recv/' GNUmakefile 4.6 prefix="/usr" 4.7 - CFLAGS="$CFLAGS -O3 -march=i486" 4.8 + CFLAGS="$CFLAGS -O3 -march=$ARCH" 4.9 export prefix CFLAGS 4.10 - make && make DESTDIR=$PWD/_pkg install 4.11 + make && make DESTDIR=$DESTDIR install 4.12 } 4.13 4.14 # Rules to gen a SliTaz package suitable for Tazpkg. 4.15 genpkg_rules() 4.16 { 4.17 mkdir -p $fs/usr 4.18 - cp -a $_pkg/usr/bin $fs/usr 4.19 + cp -a $install/usr/bin $fs/usr 4.20 } 4.21
5.1 --- a/libboost-dev/receipt Tue Jan 15 11:06:23 2013 +0100 5.2 +++ b/libboost-dev/receipt Tue Jan 15 11:21:28 2013 +0100 5.3 @@ -38,7 +38,7 @@ 5.4 # Determine if TOOLPREFIX has been defined in tazwok.conf as it should 5.5 if [ -z "$TOOLPREFIX" ] ; then 5.6 # Provide a default TOOLPREFIX value 5.7 - TOOLPREFIX=i486-pc-linux-gnu- 5.8 + TOOLPREFIX=$ARCH-pc-linux-gnu- 5.9 fi 5.10 5.11 cd $src 5.12 @@ -82,8 +82,8 @@ 5.13 genpkg_rules() 5.14 { 5.15 mkdir -p $fs/usr 5.16 - cp -a $_pkg/usr/lib $fs/usr 5.17 - cp -a $_pkg/usr/include $fs/usr 5.18 + cp -a $install/usr/lib $fs/usr 5.19 + cp -a $install/usr/include $fs/usr 5.20 for i in $RELOCATE_LIBS; do 5.21 rm -f $fs/usr/lib/*$i* 5.22 rm -r -f $fs/usr/include/boost/*$i*
6.1 --- a/mtpaint/receipt Tue Jan 15 11:06:23 2013 +0100 6.2 +++ b/mtpaint/receipt Tue Jan 15 11:21:28 2013 +0100 6.3 @@ -18,7 +18,7 @@ 6.4 cp -a $stuff/icons/*.xpm $src/src/icons1 6.5 cd $src 6.6 ./configure \ 6.7 - --cpu=i486 \ 6.8 + --cpu=$ARCH \ 6.9 --prefix=/usr \ 6.10 intl nogif && 6.11 make
7.1 --- a/nimrod/receipt Tue Jan 15 11:06:23 2013 +0100 7.2 +++ b/nimrod/receipt Tue Jan 15 11:21:28 2013 +0100 7.3 @@ -15,7 +15,7 @@ 7.4 compile_rules() 7.5 { 7.6 cd $src 7.7 - sed -i 's/uname -m/echo i486/' build.sh 7.8 + sed -i "s/uname -m/echo $ARCH/" build.sh 7.9 chmod +x build.sh 7.10 chmod +x install.sh 7.11 ./build.sh 7.12 @@ -28,8 +28,8 @@ 7.13 genpkg_rules() 7.14 { 7.15 mkdir -p $fs/usr/share/nimrod $fs/usr/lib 7.16 - cp -a $_pkg/nimrod/bin $fs/usr 7.17 - cp -a $_pkg/nimrod/config $fs/etc 7.18 - cp -a $_pkg/nimrod/lib $fs/usr/lib/nimrod 7.19 - cp -a $_pkg/nimrod/doc $fs/usr/share/nimrod 7.20 + cp -a $install/nimrod/bin $fs/usr 7.21 + cp -a $install/nimrod/config $fs/etc 7.22 + cp -a $install/nimrod/lib $fs/usr/lib/nimrod 7.23 + cp -a $install/nimrod/doc $fs/usr/share/nimrod 7.24 }
8.1 --- a/zsnes/receipt Tue Jan 15 11:06:23 2013 +0100 8.2 +++ b/zsnes/receipt Tue Jan 15 11:21:28 2013 +0100 8.3 @@ -22,7 +22,7 @@ 8.4 ./configure --prefix=/usr \ 8.5 --x-libraries=/usr/lib \ 8.6 --enable-release \ 8.7 - force_arch=i486 \ 8.8 + force_arch=$ARCH \ 8.9 $CONFIGURE_ARGS && 8.10 make && 8.11 make -j 1 install