# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1338413234 0
# Node ID 19ff6f323fe4210935203406161be8c7ee582caf
# Parent  f14976de5f5a8bdb873fa3ef0a3d0945fd4f85d0
cross x86_64: glibc libexec in /usr/lib64

diff -r f14976de5f5a -r 19ff6f323fe4 cook.conf
--- a/cook.conf	Wed May 30 18:04:06 2012 +0000
+++ b/cook.conf	Wed May 30 21:27:14 2012 +0000
@@ -33,6 +33,10 @@
 # Translation files to be included in packages.
 LOCALE=""
 
+# List of packages installed in build chroot by cook or the Cooker setup.
+SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2
+aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev"
+
 # Target host architecture type (Glibc doesn't support i386 anymore).
 ARCH="i486"
 
@@ -50,6 +54,12 @@
 # the CROSS_TREE for cross compiling. Example: CROSS_TREE="/cross/$ARCH"
 CROSS_TREE=""
 
+# List of packages installed in chroot by cook or the Cooker setup.
+# When cross compiling we need some build system tools installed and
+# some cross-compiled bdeps installed in: $PREFIX (cross host root)
+CROSS_SETUP="slitaz-toolchain zlib-dev bzip2 aufs-utils aufs bash m4 \
+autoconf automake libtool gettext"
+
 # SliTaz optimisation flags - Wide compatibility & optimized for ARCH.
 #
 # With -O2: binutils: Produce 14.0M Packed 5.5M Compressed 1.2M
@@ -81,10 +91,6 @@
 XORG_MIRROR="ftp://ftp.solnet.ch/mirror/x.org/pub/individual"
 GNOME_MIRROR="http://ftp.gnome.org/pub/GNOME/sources"
 
-# List of packages installed by cook or the Cooker setup.
-SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2
-aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev"
-
 # List of filesystems into the aufs chroot (to protect / against modifications)
 # Default tank config:
 AUFS_MOUNTS="/ /proc /sys /dev/shm /dev/pts /var/cache/tazpkg \
diff -r f14976de5f5a -r 19ff6f323fe4 cross
--- a/cross	Wed May 30 18:04:06 2012 +0000
+++ b/cross	Wed May 30 21:27:14 2012 +0000
@@ -192,9 +192,12 @@
 			echo "Extracting: glibc-ports-$GLIBC_VERSION.tar.bz2"
 			rm -rf glibc-$GLIBC_VERSION/ports
 			tar xjf $SRC/glibc-ports-$GLIBC_VERSION.tar.bz2
-			mv glibc-ports-$GLIBC_VERSION glibc-$GLIBC_VERSION/ports ;;
+			mv glibc-ports-$GLIBC_VERSION glibc-$GLIBC_VERSION/ports
+			libexec=/usr/lib/glibc ;;
 		x86_64)
-			ccflags="-m64" ;;
+			#export CFLAGS="-march=nocona -O2 -pipe"
+			ccflags="-m64"
+			libexec=/usr/lib64/glibc ;;
 	esac
 	# Disable linking to libgcc_eh
 	cd glibc-$GLIBC_VERSION
@@ -212,7 +215,7 @@
 	libc_cv_c_cleanup=yes \
 	../glibc-$GLIBC_VERSION/configure \
 		--prefix=/usr \
-		--libexec=/usr/lib/glibc \
+		--libexec=$libexec \
 		--host=$TARGET \
 		--with-headers=$sysroot/usr/include \
 		--with-binutils=$tools/bin \
@@ -240,9 +243,12 @@
 				echo "Cloning $EGLIBC_WGET/ports"
 				svn co $EGLIBC_WGET/ports eglibc-ports-$EGLIBC_VERSION >/dev/null
 			fi
-			cp -a eglibc-ports-$EGLIBC_VERSION eglibc-$EGLIBC_VERSION/ports ;;
+			cp -a eglibc-ports-$EGLIBC_VERSION eglibc-$EGLIBC_VERSION/ports
+			libexec=/usr/lib/eglibc ;;
 		x86_64)
-			ccflags="-m64" ;;
+			#export CFLAGS="-march=nocona -O2 -pipe"
+			ccflags="-m64"
+			libexec=/usr/lib64/eglibc ;;
 	esac
 	# Disable linking to libgcc_eh
 	cd eglibc-$EGLIBC_VERSION
@@ -262,7 +268,7 @@
 	RANLIB="${TARGET}-ranlib" \
 	../eglibc-$EGLIBC_VERSION/configure \
 		--prefix=/usr \
-		--libexec=/usr/lib/eglibc \
+		--libexec=$libexec \
 		--host=$TARGET \
 		--with-headers=$sysroot/usr/include \
 		--with-binutils=$tools/bin \
@@ -274,7 +280,7 @@
 		$EGLIBC_ARGS &&
 	make || exit 1
 	make install_root=$sysroot install
-	# The rpc headers (RPC is no longer in eglibc <2.13
+	# The rpc headers (RPC is no longer in eglibc <2.13)
 	#
 	#if [ "$EGLIBC_VERSION" -gt "2.13" ]; then
 		#rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
@@ -282,8 +288,8 @@
 		#rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
 		#cd sunrpc/rpcsvc
 		#for r in ${rpcsvc}; do
-			#h=`echo $r|sed -e's,\.x$,.h,'`
-			#rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+			#h=$(echo $r|sed -e's,\.x$,.h,')
+			#rpcgen -h $r -o $h || echo "unable to generate header for $r"
 		#done
 	#fi
 }
diff -r f14976de5f5a -r 19ff6f323fe4 cross.conf
--- a/cross.conf	Wed May 30 18:04:06 2012 +0000
+++ b/cross.conf	Wed May 30 21:27:14 2012 +0000
@@ -12,6 +12,7 @@
 BINUTILS_VERSION="2.22"
 LINUX_VERSION="3.2.14"
 GLIBC_VERSION="2.13"
+# x86_64: GLIBC_VERSION="2.14.1"
 EGLIBC_VERSION="2.13"
 GCC_VERSION="4.6.3"
 
@@ -32,6 +33,7 @@
 # Peer package configure arguments
 #
 # x86_64: BINUTILS_ARGS="--disable-multilib --enable-64-bit-bfd"
+# x86_64: GCC_STATIC_ARGS="--enable-languages=c --disable-multilib"
 # x86_64: GCC_FINAL_ARGS="--enable-languages=c,c++ --disable-multilib"
 #
 BINUTILS_ARGS="--enable-shared"
@@ -39,10 +41,3 @@
 EGLIBC_ARGS="--enable-add-ons --with-tls"
 GCC_STATIC_ARGS="--enable-languages=c"
 GCC_FINAL_ARGS="--enable-languages=c,c++"
-
-# List of packages installed in chroot by cook or the Cooker setup.
-# When cross compiling we need some build system tools installed and
-# some cross-compiled bdeps installed in: $PREFIX (cross host root)
-SETUP_PKGS="slitaz-toolchain zlib-dev bzip2 aufs-utils aufs bash m4 \
-autoconf automake libtool gettext"
-