# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1519307051 -7200
# Node ID 54c97f545127aaa76074490091b2f0e06eddc5de
# Parent  f2773281e93d2962f277723a494f6e1db659a52b
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.

diff -r f2773281e93d -r 54c97f545127 cook.conf
--- a/cook.conf	Wed Feb 21 12:55:19 2018 +0200
+++ b/cook.conf	Thu Feb 22 15:44:11 2018 +0200
@@ -75,9 +75,15 @@
 #
 #MAKEFLAGS="-j$(($(grep processor /proc/cpuinfo | wc -l)+1))"
 MAKEFLAGS="-j$(grep processor /proc/cpuinfo | wc -l)"
+
+# Note '-mindirect-branch=thunk' and friends appeared since GCC-7.3 and
+# an earlier versions will produce comple errors.
+# We use this flag against some flavors of the Spectre vulnerability.
+# FIXME: it looks like the flag '-mindirect-branch=thunk-extern' recommended,
+# but no one app is compiled using it even using GCC-7.3. Is something wrong?
 case "$ARCH" in
-	i?86)   CFLAGS="-march=$ARCH  -Os -pipe -mindirect-branch=thunk-extern";;
-	x86_64) CFLAGS="-march=nocona -Os -pipe -mindirect-branch=thunk-extern";;
+	i?86)   CFLAGS="-march=$ARCH  -Os -pipe -mindirect-branch=thunk";;
+	x86_64) CFLAGS="-march=nocona -Os -pipe -mindirect-branch=thunk";;
 	arm*)   CFLAGS="-march=armv6  -O2";; # FIXME
 esac
 CXXFLAGS="$CFLAGS"
diff -r f2773281e93d -r 54c97f545127 cook.site
--- a/cook.site	Wed Feb 21 12:55:19 2018 +0200
+++ b/cook.site	Thu Feb 22 15:44:11 2018 +0200
@@ -19,7 +19,7 @@
 sysconfdir="/etc"
 localstatedir="/var"
 datarootdir="$prefix/share"
-datadir="$datarootdir"
+#datadir="$datarootdir"		# respect "kbd" receipt
 infodir="$datarootdir/info"
 localedir="$datarootdir/locale"
 mandir="$datarootdir/man"
diff -r f2773281e93d -r 54c97f545127 cooker
--- a/cooker	Wed Feb 21 12:55:19 2018 +0200
+++ b/cooker	Thu Feb 22 15:44:11 2018 +0200
@@ -292,12 +292,10 @@
 			fi
 			unset HOST_ARCH
 		else
-			# HOST_ARCH not set --> in i486
-			if [ "$ARCH" == 'i486' ]; then
-				count=$(($count + 1))
-				echo "Adding: $pkg"
-				touch $pkg/arch.$ARCH
-			fi
+			# HOST_ARCH not set --> package is suitable for current ARCH (equivalent to "any")
+			count=$(($count + 1))
+			echo "Adding: $pkg"
+			touch $pkg/arch.$ARCH
 		fi
 	done
 	echo "Packages for $ARCH : $count"