wok-next diff slitaz-toolchain/receipt @ rev 20204

libjreen: update bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Nov 03 22:50:48 2017 +0100 (2017-11-03)
parents c963361d3d54
children 0e7893ac206d
line diff
     1.1 --- a/slitaz-toolchain/receipt	Fri Dec 16 01:16:56 2016 +0200
     1.2 +++ b/slitaz-toolchain/receipt	Fri Nov 03 22:50:48 2017 +0100
     1.3 @@ -1,15 +1,13 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="slitaz-toolchain"
     1.8  VERSION="6.0"
     1.9  CATEGORY="meta"
    1.10 -SHORT_DESC="SliTaz meta package to rebuild or install current toolchain."
    1.11 +SHORT_DESC="SliTaz meta package to rebuild or install current toolchain"
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="http://www.slitaz.org/"
    1.15  
    1.16 -DEPENDS="binutils linux-api-headers glibc-dev gcc make elfkickers"
    1.17 -
    1.18  # The goal here is to build and install SliTaz toolchain. We build the toolchain
    1.19  # from SliTaz packages, on SliTaz and for SliTaz so in case of new and important
    1.20  # toolchain upgrade we must build Binutils a first time, then GCC so it use the
    1.21 @@ -21,89 +19,67 @@
    1.22  # SliTaz does one big toolchain by year just after the stable release, any change
    1.23  # here or in the toolchain packages version must be discuss on the mailing list.
    1.24  
    1.25 +ver() { grep ^VERSION $WOK/$1/receipt | cut -d '"' -f2; }
    1.26 +
    1.27  # Rules to configure and make the package.
    1.28  compile_rules()
    1.29  {
    1.30  	[ -x /usr/bin/cook ] || return 0
    1.31 +
    1.32  	tmplog=$LOGS/$PACKAGE.tmplog
    1.33 -	echo "Cook: $PACKAGE $VERSION" > $tmplog
    1.34 -	separator >> $tmplog
    1.35 -	cat >> $tmplog << EOT
    1.36 -Cook toolchain : started $(date "+%Y-%m-%d %H:%M")
    1.37 +
    1.38 +	cat > $tmplog <<EOT
    1.39 +Cook: $PACKAGE $VERSION
    1.40 +$(separator)
    1.41 +Cook toolchain : started $(date '+%F %R')
    1.42  Architecture   : $ARCH
    1.43  Build system   : $BUILD_SYSTEM
    1.44  Host  system   : $HOST_SYSTEM
    1.45 +$(separator -)
    1.46  EOT
    1.47 -	
    1.48 -	# 1. binutils (first pass)
    1.49 -	echo "cook: binutils first pass: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.50 -	cook binutils --install
    1.51  
    1.52 -	# 2. gcc (first pass)
    1.53 -	echo "cook: GCC first pass: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.54 -	cook gcc --install --first-pass
    1.55 -	cook gcc-lib-base --install
    1.56 -	
    1.57 -	# 3. linux-api-headers
    1.58 -	echo "cook: linux API headers: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.59 -	cook linux-api-headers --install
    1.60 -	
    1.61 -	# 4. glibc
    1.62 -	for i in glibc glibc-base glibc-locale glibc-dev
    1.63 -	do
    1.64 -		echo "cook: $i: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.65 -		cook $i --install
    1.66 -	done
    1.67 +	echo "cook: Binutils first pass : $(date '+%F %R')" >> $tmplog
    1.68 +	cook binutils
    1.69 +	echo "cook: GCC first pass      : $(date '+%F %R')" >> $tmplog
    1.70 +	cook gcc --first-pass
    1.71 +	echo "cook: Linux API headers   : $(date '+%F %R')" >> $tmplog
    1.72 +	cook linux-api-headers
    1.73 +	echo "cook: Glibc               : $(date '+%F %R')" >> $tmplog
    1.74 +	cook glibc
    1.75 +	echo "cook: Binutils final      : $(date '+%F %R')" >> $tmplog
    1.76 +	cook binutils
    1.77 +	echo "cook: GCC final           : $(date '+%F %R')" >> $tmplog
    1.78 +	cook gcc
    1.79  
    1.80 -	# 5. binutils (final)
    1.81 -	echo "cook: binutils final: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.82 -	cook binutils --install
    1.83 -	
    1.84 -	# 6. gcc (final)
    1.85 -	echo "cook: GCC final: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.86 -	for i in gcc gcc-lib-base libobjc libgomp
    1.87 -	do
    1.88 -		echo "cook: $i: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
    1.89 -		cook $i --install
    1.90 -	done
    1.91 -	cook libgfortran
    1.92 -	cook gfortran
    1.93 -	separator >> $tmplog
    1.94 +	cat >> $tmplog <<EOT
    1.95 +$(separator)
    1.96  
    1.97 -	# GCC info in toolchain.log
    1.98 -	echo -e "\nGCC compiler information" >> $tmplog
    1.99 -	separator >> $tmplog
   1.100 -	gcc -v 2>> $tmplog
   1.101 +GCC compiler information
   1.102 +$(separator)
   1.103 +$(gcc -v 2>&1 | sed 's|--|\n  --|g')
   1.104 +$(separator)
   1.105  
   1.106 -	# All packages cooked got ther own log so we dont keep them.
   1.107 -	separator >> $tmplog; echo "" >> $tmplog
   1.108 +EOT
   1.109 +
   1.110 +	# All packages cooked got ther own log so we don't keep them.
   1.111  	mv -f $tmplog $LOGS/$PACKAGE.log
   1.112 -}
   1.113  
   1.114 -# Rules to gen a SliTaz package suitable for Tazpkg.
   1.115 -genpkg_rules()
   1.116 -{
   1.117 -	binutils=$(grep ^VERSION $WOK/binutils/receipt | cut -d '"' -f 2)
   1.118 -	   linux=$(grep ^VERSION $WOK/linux-api-headers/receipt | cut -d '"' -f 2)
   1.119 -	     gcc=$(grep ^VERSION $WOK/gcc/receipt      | cut -d '"' -f 2)
   1.120 -	   glibc=$(grep ^VERSION $WOK/glibc/receipt    | cut -d '"' -f 2)
   1.121 -	
   1.122 -	mkdir -p $fs/usr/share/doc/slitaz
   1.123 -	cat > $fs/usr/share/doc/slitaz/toolchain.txt << EOT
   1.124 +	mkdir -p $install/usr/share/doc/slitaz
   1.125 +	cat > $install/usr/share/doc/slitaz/toolchain.txt <<EOT
   1.126  SliTaz GNU/Linux toolchain
   1.127  ================================================================================
   1.128  
   1.129 -Build date   : $(date "+%Y-%m-%d")
   1.130 +Build date   : $(date "+%F")
   1.131  Architecture : $ARCH
   1.132  Build system : $BUILD_SYSTEM
   1.133  Host  system : $HOST_SYSTEM
   1.134  
   1.135  Packages:
   1.136  
   1.137 -  * Binutils $binutils
   1.138 -  * Linux API headers $linux
   1.139 -  * GCC $gcc
   1.140 -  * Glibc $glibc
   1.141 +  * Binutils $(ver binutils)
   1.142 +  * Linux API headers $(ver linux-api-headers)
   1.143 +  * GCC $(ver gcc)
   1.144 +  * Glibc $(ver glibc)
   1.145  
   1.146  Toolchain documentation: http://doc.slitaz.org/en:cookbook:toolchain
   1.147  
   1.148 @@ -111,3 +87,10 @@
   1.149  
   1.150  EOT
   1.151  }
   1.152 +
   1.153 +# Rules to gen a SliTaz package suitable for Tazpkg.
   1.154 +genpkg_rules()
   1.155 +{
   1.156 +	copy @std
   1.157 +	DEPENDS="binutils linux-api-headers glibc-dev gcc make elfkickers"
   1.158 +}