wok-next rev 19791
linux-libre: use gcc3
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Jun 23 09:57:52 2017 +0200 (2017-06-23) |
parents | b938e6730252 |
children | 6e60cb130afd |
files | linux-libre/receipt |
line diff
1.1 --- a/linux-libre/receipt Thu Jun 22 20:59:17 2017 +0300 1.2 +++ b/linux-libre/receipt Fri Jun 23 09:57:52 2017 +0200 1.3 @@ -10,7 +10,7 @@ 1.4 WEB_SITE="http://www.fsfla.org/svnwiki/selibre/linux-libre/" 1.5 WGET_URL="http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/$VERSION/$TARBALL" 1.6 1.7 -BUILD_DEPENDS="slitaz-toolchain perl git lzma patch" 1.8 +BUILD_DEPENDS="slitaz-toolchain perl git lzma patch gcc3" 1.9 SPLIT="linux-libre-acpi linux-libre-agp linux-libre-aoe linux-libre-appletalk \ 1.10 linux-libre-autofs linux-libre-bluetooth linux-libre-bridge linux-libre-btrfs \ 1.11 linux-libre-cifs linux-libre-coda linux-libre-configfs linux-libre-cpufreq \ 1.12 @@ -37,8 +37,6 @@ 1.13 # sed -i 's|VERSION="OLDVERSION"|VERSION="NEWVERSION"|g' $i 1.14 #done 1.15 1.16 - [ ! -x /usr/bin/cook ] && report open-bloc 1.17 - 1.18 # Check for Aufs and cook it if unbuilt. 1.19 echo "Checking for Aufs packages..." 1.20 _AUFSVER=`grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 1.21 @@ -52,7 +50,7 @@ 1.22 # needs linux-module-headers. 1.23 AUFSDIR=$WOK/aufs/aufs-${_AUFSVER} 1.24 [ -d "$AUFSDIR" ] && rm -rf $AUFSDIR 1.25 - tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; } 1.26 + tazwok get-src aufs --target=$AUFSDIR || return 1 1.27 fi 1.28 1.29 echo "Copying Aufs files and patches..." 1.30 @@ -75,7 +73,7 @@ 1.31 continue 1.32 fi 1.33 echo "Apply $patch_file" 1.34 - patch -p1 < $WOK/$PACKAGE/slitaz/$patch_file || { report close-bloc; return 1; } 1.35 + patch -p1 < $WOK/$PACKAGE/slitaz/$patch_file || return 1 1.36 touch done.$patch_file 1.37 done <<EOT 1.38 $PACKAGE-diff-$VERSION.u 1.39 @@ -90,15 +88,14 @@ 1.40 005-squashfs-add-xz-compression-configuration-option.patch 1.41 EOT 1.42 1.43 - [ ! -x /usr/bin/cook ] && report step "Make kernel proper and then build lguest" 1.44 + export LD_LIBRARY_PATH="/usr/libgcc3:$LD_LIBRARY_PATH" 1.45 + export MAKEFLAGS="$MAKEFLAGS CC=gcc-3 CXX=g++-3" 1.46 1.47 make mrproper 1.48 cd Documentation/lguest 1.49 - make $MAKEFLAGS lguest || { report close-bloc; return 1; } 1.50 + make $MAKEFLAGS lguest || return 1 1.51 cd $src 1.52 1.53 - [ ! -x /usr/bin/cook ] && report step "Make bzImage without modules first" 1.54 - 1.55 # Build bzImage without modules first 1.56 cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config 1.57 sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config 1.58 @@ -108,13 +105,11 @@ 1.59 -e 's/^CONFIG_R8187SE/#&/' \ 1.60 -e 's/^CONFIG_RT2870/#&/' .config 1.61 yes '' | make oldconfig 1.62 - make $MAKEFLAGS bzImage || { report close-bloc; return 1; } 1.63 + make $MAKEFLAGS bzImage || return 1 1.64 [ -d $DESTDIR ] || mkdir -p $DESTDIR 1.65 mv arch/x86/boot/bzImage $DESTDIR 1.66 mv System.map System.map-without-modules 1.67 1.68 - [ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules" 1.69 - 1.70 # Build bzImage with modules 1.71 cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config 1.72 make oldconfig 1.73 @@ -123,20 +118,14 @@ 1.74 make $MAKEFLAGS modules && 1.75 make INSTALL_MOD_PATH=$DESTDIR modules_install && 1.76 make INSTALL_HDR_PATH=$DESTDIR/usr headers_install && 1.77 - [ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; } 1.78 + [ -s arch/x86/boot/bzImage ] return 1 1.79 mkdir -p $DESTDIR/boot 2> /dev/null 1.80 mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz 1.81 1.82 - [ ! -x /usr/bin/cook ] && report step "Compressing all modules" 1.83 - 1.84 # Compress all modules. 1.85 $stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz 1.86 ln System.map System.map-modules 1.87 ln Module.symvers Module.symvers-modules 1.88 - 1.89 - if [ ! -x /usr/bin/cook ]; then 1.90 - report close-bloc 1.91 - fi 1.92 } 1.93 1.94 # Rules to gen a SliTaz package suitable for Tazpkg.