# HG changeset patch # User Pascal Bellard # Date 1358245288 -3600 # Node ID 8437ad3ae8141803f94a1ac99e1ec721492259a3 # Parent 72a16f6d46c291c1a37d6ceba3e2a6ecafb55384 libboost-dev, input-utils, gcc3, gcc+gcj, ffmpeg-svn, zsnes, zlib, nimrod, mtpaint: use $ARCH diff -r 72a16f6d46c2 -r 8437ad3ae814 ffmpeg-svn/receipt --- a/ffmpeg-svn/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/ffmpeg-svn/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -26,8 +26,8 @@ ./configure \ --prefix=/usr \ --enable-gpl \ - --arch=i486 \ - --cpu=i486 \ + --arch=$ARCH \ + --cpu=$ARCH \ --enable-shared \ --enable-small \ --enable-pthreads \ @@ -36,15 +36,15 @@ --disable-mmx2 \ --disable-ssse3 && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - cp -a $_pkg/usr/lib/*so* $fs/usr/lib - cp -a $_pkg/usr/bin $fs/usr + cp -a $install/usr/lib/*so* $fs/usr/lib + cp -a $install/usr/bin $fs/usr # ffplay with it SDL dep go in a splited package rm $fs/usr/bin/ffplay } diff -r 72a16f6d46c2 -r 8437ad3ae814 gcc+gcj/receipt --- a/gcc+gcj/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/gcc+gcj/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -28,7 +28,7 @@ cd $src # Set HOST_SYSTEM if not defined in tazwok.conf as it should be if [ -z "$HOST_SYSTEM" ] ; then - HOST_SYSTEM="i486-slitaz-linux" + HOST_SYSTEM="$ARCH-slitaz-linux" fi GCC_TARGET=$HOST_SYSTEM @@ -58,7 +58,7 @@ --enable-languages=c,c++,objc,java --enable-shared \ --with-system-zlib \ --enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \ - --enable-threads=posix --with-tune=i486 \ + --enable-threads=posix --with-tune=$ARCH \ --enable-java-home --with-arch-directory=i386 \ --with-jvm-root-dir=/usr/lib/jvm/java-gcj \ --with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \ @@ -77,18 +77,18 @@ genpkg_rules() { mkdir -p $fs/usr/share - cp -a $_pkg/usr/share/java $fs/usr/share - cp -a $_pkg/usr/bin $fs/usr + cp -a $install/usr/share/java $fs/usr/share + cp -a $install/usr/bin $fs/usr # Copy all libs. Remove libgcc_s.so and libstdc++.so # they goes in gcc-lib-base-$VERSION package. - cp -a $_pkg/usr/lib $fs/usr + cp -a $install/usr/lib $fs/usr rm $fs/usr/lib/libgcc_s.so* rm $fs/usr/lib/libstdc++.so* rm $fs/usr/lib/libgomp.so* rm $fs/usr/lib/gcj-$VERSION-11/*.la rm $fs/usr/lib/*.la # Include files. - cp -a $_pkg/usr/include $fs/usr + cp -a $install/usr/include $fs/usr } # Post install commands for Tazpkg. diff -r 72a16f6d46c2 -r 8437ad3ae814 gcc3/receipt --- a/gcc3/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/gcc3/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -24,7 +24,7 @@ --infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \ --enable-languages=c,c++ --enable-shared --with-system-zlib \ --enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \ - --enable-threads=posix --with-tune=i486 \ + --enable-threads=posix --with-tune=$ARCH \ --program-suffix=-3 make $MAKEFLAGS bootstrap # Make install in the source tree to help creating derivated pkgs diff -r 72a16f6d46c2 -r 8437ad3ae814 input-utils/receipt --- a/input-utils/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/input-utils/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -18,15 +18,15 @@ cd $src sed -i 's/input-recv lircd.conf/input-recv/' GNUmakefile prefix="/usr" - CFLAGS="$CFLAGS -O3 -march=i486" + CFLAGS="$CFLAGS -O3 -march=$ARCH" export prefix CFLAGS - make && make DESTDIR=$PWD/_pkg install + make && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr - cp -a $_pkg/usr/bin $fs/usr + cp -a $install/usr/bin $fs/usr } diff -r 72a16f6d46c2 -r 8437ad3ae814 libboost-dev/receipt --- a/libboost-dev/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/libboost-dev/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -38,7 +38,7 @@ # Determine if TOOLPREFIX has been defined in tazwok.conf as it should if [ -z "$TOOLPREFIX" ] ; then # Provide a default TOOLPREFIX value - TOOLPREFIX=i486-pc-linux-gnu- + TOOLPREFIX=$ARCH-pc-linux-gnu- fi cd $src @@ -82,8 +82,8 @@ genpkg_rules() { mkdir -p $fs/usr - cp -a $_pkg/usr/lib $fs/usr - cp -a $_pkg/usr/include $fs/usr + cp -a $install/usr/lib $fs/usr + cp -a $install/usr/include $fs/usr for i in $RELOCATE_LIBS; do rm -f $fs/usr/lib/*$i* rm -r -f $fs/usr/include/boost/*$i* diff -r 72a16f6d46c2 -r 8437ad3ae814 mtpaint/receipt --- a/mtpaint/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/mtpaint/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -18,7 +18,7 @@ cp -a $stuff/icons/*.xpm $src/src/icons1 cd $src ./configure \ - --cpu=i486 \ + --cpu=$ARCH \ --prefix=/usr \ intl nogif && make diff -r 72a16f6d46c2 -r 8437ad3ae814 nimrod/receipt --- a/nimrod/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/nimrod/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -15,7 +15,7 @@ compile_rules() { cd $src - sed -i 's/uname -m/echo i486/' build.sh + sed -i "s/uname -m/echo $ARCH/" build.sh chmod +x build.sh chmod +x install.sh ./build.sh @@ -28,8 +28,8 @@ genpkg_rules() { mkdir -p $fs/usr/share/nimrod $fs/usr/lib - cp -a $_pkg/nimrod/bin $fs/usr - cp -a $_pkg/nimrod/config $fs/etc - cp -a $_pkg/nimrod/lib $fs/usr/lib/nimrod - cp -a $_pkg/nimrod/doc $fs/usr/share/nimrod + cp -a $install/nimrod/bin $fs/usr + cp -a $install/nimrod/config $fs/etc + cp -a $install/nimrod/lib $fs/usr/lib/nimrod + cp -a $install/nimrod/doc $fs/usr/share/nimrod } diff -r 72a16f6d46c2 -r 8437ad3ae814 zsnes/receipt --- a/zsnes/receipt Tue Jan 15 11:06:23 2013 +0100 +++ b/zsnes/receipt Tue Jan 15 11:21:28 2013 +0100 @@ -22,7 +22,7 @@ ./configure --prefix=/usr \ --x-libraries=/usr/lib \ --enable-release \ - force_arch=i486 \ + force_arch=$ARCH \ $CONFIGURE_ARGS && make && make -j 1 install