cookutils rev 1032
cook.conf: add some explanations; cook.site: do not force ${datadir} value; cooker: many receipts not include $HOST_ARCH definition, let them build on x86_64 host without obstacles.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu Feb 22 15:44:11 2018 +0200 (2018-02-22) |
parents | f2773281e93d |
children | ac5d3d0f9b3c |
files | cook.conf cook.site cooker |
line diff
1.1 --- a/cook.conf Wed Feb 21 12:55:19 2018 +0200 1.2 +++ b/cook.conf Thu Feb 22 15:44:11 2018 +0200 1.3 @@ -75,9 +75,15 @@ 1.4 # 1.5 #MAKEFLAGS="-j$(($(grep processor /proc/cpuinfo | wc -l)+1))" 1.6 MAKEFLAGS="-j$(grep processor /proc/cpuinfo | wc -l)" 1.7 + 1.8 +# Note '-mindirect-branch=thunk' and friends appeared since GCC-7.3 and 1.9 +# an earlier versions will produce comple errors. 1.10 +# We use this flag against some flavors of the Spectre vulnerability. 1.11 +# FIXME: it looks like the flag '-mindirect-branch=thunk-extern' recommended, 1.12 +# but no one app is compiled using it even using GCC-7.3. Is something wrong? 1.13 case "$ARCH" in 1.14 - i?86) CFLAGS="-march=$ARCH -Os -pipe -mindirect-branch=thunk-extern";; 1.15 - x86_64) CFLAGS="-march=nocona -Os -pipe -mindirect-branch=thunk-extern";; 1.16 + i?86) CFLAGS="-march=$ARCH -Os -pipe -mindirect-branch=thunk";; 1.17 + x86_64) CFLAGS="-march=nocona -Os -pipe -mindirect-branch=thunk";; 1.18 arm*) CFLAGS="-march=armv6 -O2";; # FIXME 1.19 esac 1.20 CXXFLAGS="$CFLAGS"
2.1 --- a/cook.site Wed Feb 21 12:55:19 2018 +0200 2.2 +++ b/cook.site Thu Feb 22 15:44:11 2018 +0200 2.3 @@ -19,7 +19,7 @@ 2.4 sysconfdir="/etc" 2.5 localstatedir="/var" 2.6 datarootdir="$prefix/share" 2.7 -datadir="$datarootdir" 2.8 +#datadir="$datarootdir" # respect "kbd" receipt 2.9 infodir="$datarootdir/info" 2.10 localedir="$datarootdir/locale" 2.11 mandir="$datarootdir/man"
3.1 --- a/cooker Wed Feb 21 12:55:19 2018 +0200 3.2 +++ b/cooker Thu Feb 22 15:44:11 2018 +0200 3.3 @@ -292,12 +292,10 @@ 3.4 fi 3.5 unset HOST_ARCH 3.6 else 3.7 - # HOST_ARCH not set --> in i486 3.8 - if [ "$ARCH" == 'i486' ]; then 3.9 - count=$(($count + 1)) 3.10 - echo "Adding: $pkg" 3.11 - touch $pkg/arch.$ARCH 3.12 - fi 3.13 + # HOST_ARCH not set --> package is suitable for current ARCH (equivalent to "any") 3.14 + count=$(($count + 1)) 3.15 + echo "Adding: $pkg" 3.16 + touch $pkg/arch.$ARCH 3.17 fi 3.18 done 3.19 echo "Packages for $ARCH : $count"