SliTaz Repositories

     1.1 --- a/.hgtags	Tue May 17 13:30:38 2011 +0000
     1.2 +++ b/.hgtags	Mon May 23 20:45:06 2011 +0000
     1.3 @@ -29,3 +29,4 @@
     1.4  ada9fd93793699e4858c3102a7110bedb5e86710 4.2.12
     1.5  621bcc0de8ca7e029c7ca34060786f4cf8fba0f9 4.2.13
     1.6  1165e2c0ac23be43123fef2fc5b3b13ef11e2099 4.2.14
     1.7 +40ed5424dbfcbd93a0e59376495f916552f57f34 4.2.15

     2.1 --- a/examples/config.site	Tue May 17 13:30:38 2011 +0000
     2.2 +++ b/examples/config.site	Mon May 23 20:45:06 2011 +0000
     2.3 @@ -31,8 +31,8 @@
     2.4  default_mandir=$default_datarootdir/man
     2.5  default_sysconfigdir=/etc
     2.6  default_localstatedir=/var
     2.7 -default_build="$BUILD_HOST"
     2.8 -default_host="$BUILD_HOST"
     2.9 +default_build="$BUILD_SYSTEM"
    2.10 +default_host="$HOST_SYSTEM"
    2.11  
    2.12  
    2.13  # Some variable are prefixed by "${prefix}" instead of "${datarootdir}".

     3.1 --- a/examples/tazwok.conf	Tue May 17 13:30:38 2011 +0000
     3.2 +++ b/examples/tazwok.conf	Mon May 23 20:45:06 2011 +0000
     3.3 @@ -33,8 +33,15 @@
     3.4  # Default architecture.
     3.5  ARCH="i486"
     3.6  
     3.7 +# Build and host. These options are for cross-compiling. If you specify
     3.8 +# both options and BUILD_SYSTEM is different from HOST_SYSTEM, configure
     3.9 +# will prepare to cross-compile from BUILD_SYSTEM to be used on HOST_SYSTEM.
    3.10 +BUILD_SYSTEM="$(uname -m)-slitaz-linux"
    3.11 +#BUILD_SYSTEM="$ARCH-slitaz-linux"
    3.12 +HOST_SYSTEM="$ARCH-slitaz-linux"
    3.13 +
    3.14  # Default build host.
    3.15 -BUILD_HOST="$ARCH-pc-linux-gnu"
    3.16 +BUILD_HOST="$HOST_SYSTEM"
    3.17  
    3.18  # Default compilation flags.
    3.19  # More details at :
    3.20 @@ -56,14 +63,15 @@
    3.21  # Cook packages fully optimized for your hardware - Warning, compatible only
    3.22  # with same hardware and newest of the same family :
    3.23  #CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
    3.24 -CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer"
    3.25 +#CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer"
    3.26 +CFLAGS="-march=$ARCH -0s -pipe -fomit-frame-pointer"
    3.27  CXXFLAGS="$CFLAGS"
    3.28  
    3.29  # Default tool prefix.
    3.30 -TOOLPREFIX="${BUILD_HOST}-"
    3.31 +TOOLPREFIX="${HOST_SYSTEM}-"
    3.32  
    3.33  # CONFIGURE_ARGS is here only for backward compatibility.
    3.34 -CONFIGURE_ARGS="--build=$BUILD_HOST --host=$BUILD_HOST"
    3.35 +CONFIGURE_ARGS="--build=$BUILD_SYSTEM --host=$HOST_SYSTEM"
    3.36  
    3.37  # Translation files to be included in packages. Note that you can specify
    3.38  # several locales.
    3.39 @@ -85,7 +93,7 @@
    3.40  # FSH standard directories with init. Package generation will abort if
    3.41  # a file is installed in a non-specified path. Note /vz is for OpenVZ.
    3.42  FSH="bin boot dev etc home init lib media mnt proc root sbin share sys \
    3.43 -tmp usr run var vz usr/bin usr/games usr/include usr/lib usr/local usr/sbin \
    3.44 +tmp usr run run/udev var vz usr/bin usr/games usr/include usr/lib usr/local usr/sbin \
    3.45  usr/share usr/src"
    3.46  
    3.47  # tazpkg compression "gzip" or "lzma".

     4.1 --- a/tazwok	Tue May 17 13:30:38 2011 +0000
     4.2 +++ b/tazwok	Mon May 23 20:45:06 2011 +0000
     4.3 @@ -720,7 +720,8 @@
     4.4  			CXXFLAGS=$(echo "$CXXFLAGS" | tr -s ' ') \
     4.5  			MAKEFLAGS DESTDIR BUILD_HOST CONFIG_SITE default_prefix \
     4.6  			default_datarootdir default_datadir default_localedir \
     4.7 -			default_infodir default_mandir default_build default_host
     4.8 +			default_infodir default_mandir default_build default_host \
     4.9 +			BUILD_SYSTEM HOST_SYSTEM
    4.10  		local LC_ALL=POSIX LANG=POSIX
    4.11  		compile_rules
    4.12  		return_code=$?
    4.13 @@ -1591,21 +1592,14 @@
    4.14  	report step "Generating wok-wanted.txt"
    4.15  	gen_wan_db
    4.16  	report step "Generating wok-depends.txt"
    4.17 -	for PACKAGE in $(cut -f1 -d '|' $PACKAGES_REPOSITORY/packages.desc \
    4.18 -		$INCOMING_REPOSITORY/packages.desc | sort -u); do
    4.19 -		RECEIPT=$WOK/$PACKAGE/receipt
    4.20 -		if [ -s $RECEIPT ]; then
    4.21 -			source_receipt
    4.22 -			echo -e $PACKAGE"\t "$DEPENDS" \t "$BUILD_DEPENDS' ' >> $dep_db
    4.23 -		fi
    4.24 -	done
    4.25 +	gen_dep_db
    4.26  	sort_db
    4.27  	report close-bloc
    4.28  }
    4.29  
    4.30  gen_wan_db()
    4.31  {
    4.32 -	rm -f $wan_db
    4.33 +	[ -f $wan_db ] && rm -f $wan_db
    4.34  	for RECEIPT in $(fgrep -l WANTED $WOK/*/receipt); do
    4.35  		WANTED=
    4.36  		source $RECEIPT
    4.37 @@ -1614,6 +1608,18 @@
    4.38  	done
    4.39  }
    4.40  
    4.41 +gen_dep_db()
    4.42 +{
    4.43 +	[ -f $dep_db ] && rm -f $dep_db
    4.44 +	for PACKAGE in $(ls $WOK); do
    4.45 +		RECEIPT=$WOK/$PACKAGE/receipt
    4.46 +		if [ -s $RECEIPT ]; then
    4.47 +			source_receipt
    4.48 +			echo -e $PACKAGE"\t "$DEPENDS" \t "$BUILD_DEPENDS' ' >> $dep_db
    4.49 +		fi
    4.50 +	done
    4.51 +}
    4.52 +
    4.53  update_wan_db()
    4.54  {
    4.55  	local PACKAGE=$PACKAGE
    4.56 @@ -3092,7 +3098,7 @@
    4.57  compile_rules()
    4.58  {
    4.59  	cd $src
    4.60 -	./configure && make && make install
    4.61 +	./configure $CONFIGURE_ARGS && make && make install
    4.62  }
    4.63  
    4.64  # Rules to gen a SliTaz package suitable for Tazpkg.