SliTaz Repositories

     1.1 --- a/cook.conf	Wed May 30 18:04:06 2012 +0000
     1.2 +++ b/cook.conf	Wed May 30 21:27:14 2012 +0000
     1.3 @@ -33,6 +33,10 @@
     1.4  # Translation files to be included in packages.
     1.5  LOCALE=""
     1.6  
     1.7 +# List of packages installed in build chroot by cook or the Cooker setup.
     1.8 +SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2
     1.9 +aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev"
    1.10 +
    1.11  # Target host architecture type (Glibc doesn't support i386 anymore).
    1.12  ARCH="i486"
    1.13  
    1.14 @@ -50,6 +54,12 @@
    1.15  # the CROSS_TREE for cross compiling. Example: CROSS_TREE="/cross/$ARCH"
    1.16  CROSS_TREE=""
    1.17  
    1.18 +# List of packages installed in chroot by cook or the Cooker setup.
    1.19 +# When cross compiling we need some build system tools installed and
    1.20 +# some cross-compiled bdeps installed in: $PREFIX (cross host root)
    1.21 +CROSS_SETUP="slitaz-toolchain zlib-dev bzip2 aufs-utils aufs bash m4 \
    1.22 +autoconf automake libtool gettext"
    1.23 +
    1.24  # SliTaz optimisation flags - Wide compatibility & optimized for ARCH.
    1.25  #
    1.26  # With -O2: binutils: Produce 14.0M Packed 5.5M Compressed 1.2M
    1.27 @@ -81,10 +91,6 @@
    1.28  XORG_MIRROR="ftp://ftp.solnet.ch/mirror/x.org/pub/individual"
    1.29  GNOME_MIRROR="http://ftp.gnome.org/pub/GNOME/sources"
    1.30  
    1.31 -# List of packages installed by cook or the Cooker setup.
    1.32 -SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2
    1.33 -aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev"
    1.34 -
    1.35  # List of filesystems into the aufs chroot (to protect / against modifications)
    1.36  # Default tank config:
    1.37  AUFS_MOUNTS="/ /proc /sys /dev/shm /dev/pts /var/cache/tazpkg \

     2.1 --- a/cross	Wed May 30 18:04:06 2012 +0000
     2.2 +++ b/cross	Wed May 30 21:27:14 2012 +0000
     2.3 @@ -192,9 +192,12 @@
     2.4  			echo "Extracting: glibc-ports-$GLIBC_VERSION.tar.bz2"
     2.5  			rm -rf glibc-$GLIBC_VERSION/ports
     2.6  			tar xjf $SRC/glibc-ports-$GLIBC_VERSION.tar.bz2
     2.7 -			mv glibc-ports-$GLIBC_VERSION glibc-$GLIBC_VERSION/ports ;;
     2.8 +			mv glibc-ports-$GLIBC_VERSION glibc-$GLIBC_VERSION/ports
     2.9 +			libexec=/usr/lib/glibc ;;
    2.10  		x86_64)
    2.11 -			ccflags="-m64" ;;
    2.12 +			#export CFLAGS="-march=nocona -O2 -pipe"
    2.13 +			ccflags="-m64"
    2.14 +			libexec=/usr/lib64/glibc ;;
    2.15  	esac
    2.16  	# Disable linking to libgcc_eh
    2.17  	cd glibc-$GLIBC_VERSION
    2.18 @@ -212,7 +215,7 @@
    2.19  	libc_cv_c_cleanup=yes \
    2.20  	../glibc-$GLIBC_VERSION/configure \
    2.21  		--prefix=/usr \
    2.22 -		--libexec=/usr/lib/glibc \
    2.23 +		--libexec=$libexec \
    2.24  		--host=$TARGET \
    2.25  		--with-headers=$sysroot/usr/include \
    2.26  		--with-binutils=$tools/bin \
    2.27 @@ -240,9 +243,12 @@
    2.28  				echo "Cloning $EGLIBC_WGET/ports"
    2.29  				svn co $EGLIBC_WGET/ports eglibc-ports-$EGLIBC_VERSION >/dev/null
    2.30  			fi
    2.31 -			cp -a eglibc-ports-$EGLIBC_VERSION eglibc-$EGLIBC_VERSION/ports ;;
    2.32 +			cp -a eglibc-ports-$EGLIBC_VERSION eglibc-$EGLIBC_VERSION/ports
    2.33 +			libexec=/usr/lib/eglibc ;;
    2.34  		x86_64)
    2.35 -			ccflags="-m64" ;;
    2.36 +			#export CFLAGS="-march=nocona -O2 -pipe"
    2.37 +			ccflags="-m64"
    2.38 +			libexec=/usr/lib64/eglibc ;;
    2.39  	esac
    2.40  	# Disable linking to libgcc_eh
    2.41  	cd eglibc-$EGLIBC_VERSION
    2.42 @@ -262,7 +268,7 @@
    2.43  	RANLIB="${TARGET}-ranlib" \
    2.44  	../eglibc-$EGLIBC_VERSION/configure \
    2.45  		--prefix=/usr \
    2.46 -		--libexec=/usr/lib/eglibc \
    2.47 +		--libexec=$libexec \
    2.48  		--host=$TARGET \
    2.49  		--with-headers=$sysroot/usr/include \
    2.50  		--with-binutils=$tools/bin \
    2.51 @@ -274,7 +280,7 @@
    2.52  		$EGLIBC_ARGS &&
    2.53  	make || exit 1
    2.54  	make install_root=$sysroot install
    2.55 -	# The rpc headers (RPC is no longer in eglibc <2.13
    2.56 +	# The rpc headers (RPC is no longer in eglibc <2.13)
    2.57  	#
    2.58  	#if [ "$EGLIBC_VERSION" -gt "2.13" ]; then
    2.59  		#rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
    2.60 @@ -282,8 +288,8 @@
    2.61  		#rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
    2.62  		#cd sunrpc/rpcsvc
    2.63  		#for r in ${rpcsvc}; do
    2.64 -			#h=`echo $r|sed -e's,\.x$,.h,'`
    2.65 -			#rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
    2.66 +			#h=$(echo $r|sed -e's,\.x$,.h,')
    2.67 +			#rpcgen -h $r -o $h || echo "unable to generate header for $r"
    2.68  		#done
    2.69  	#fi
    2.70  }

     3.1 --- a/cross.conf	Wed May 30 18:04:06 2012 +0000
     3.2 +++ b/cross.conf	Wed May 30 21:27:14 2012 +0000
     3.3 @@ -12,6 +12,7 @@
     3.4  BINUTILS_VERSION="2.22"
     3.5  LINUX_VERSION="3.2.14"
     3.6  GLIBC_VERSION="2.13"
     3.7 +# x86_64: GLIBC_VERSION="2.14.1"
     3.8  EGLIBC_VERSION="2.13"
     3.9  GCC_VERSION="4.6.3"
    3.10  
    3.11 @@ -32,6 +33,7 @@
    3.12  # Peer package configure arguments
    3.13  #
    3.14  # x86_64: BINUTILS_ARGS="--disable-multilib --enable-64-bit-bfd"
    3.15 +# x86_64: GCC_STATIC_ARGS="--enable-languages=c --disable-multilib"
    3.16  # x86_64: GCC_FINAL_ARGS="--enable-languages=c,c++ --disable-multilib"
    3.17  #
    3.18  BINUTILS_ARGS="--enable-shared"
    3.19 @@ -39,10 +41,3 @@
    3.20  EGLIBC_ARGS="--enable-add-ons --with-tls"
    3.21  GCC_STATIC_ARGS="--enable-languages=c"
    3.22  GCC_FINAL_ARGS="--enable-languages=c,c++"
    3.23 -
    3.24 -# List of packages installed in chroot by cook or the Cooker setup.
    3.25 -# When cross compiling we need some build system tools installed and
    3.26 -# some cross-compiled bdeps installed in: $PREFIX (cross host root)
    3.27 -SETUP_PKGS="slitaz-toolchain zlib-dev bzip2 aufs-utils aufs bash m4 \
    3.28 -autoconf automake libtool gettext"
    3.29 -