wok-stable rev 6892

Fixed icedtea6-jdk i think. Fixing Sanity.gak for busybox compatiility was causing a patch to fail. Forced wget and sed to be installed if there soft link now.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Oct 21 02:51:11 2010 +0000 (2010-10-21)
parents 500aaeee12ad
children 8ad8877e8d87
files icedtea6-jdk/receipt
line diff
     1.1 --- a/icedtea6-jdk/receipt	Thu Oct 21 02:47:40 2010 +0000
     1.2 +++ b/icedtea6-jdk/receipt	Thu Oct 21 02:51:11 2010 +0000
     1.3 @@ -14,7 +14,7 @@
     1.4  freetype-dev gtk+-dev giflib-dev jpeg-dev libpng-dev \
     1.5  xorg-inputproto xorg-kbproto xorg-libXi-dev xorg-libXinerama-dev \
     1.6  xorg-libXp-dev xorg-libXt-dev xorg-libXtst-dev xorg-printproto \
     1.7 -xorg-recordproto xorg-renderproto xorg-xextproto xorg-xineramaproto xorg-xproto wget"
     1.8 +xorg-recordproto xorg-renderproto xorg-xextproto xorg-xineramaproto xorg-xproto"
     1.9  TARBALL="$SOURCE-$VERSION.tar.gz"
    1.10  WEB_SITE="http://www.iced-tea.org/"
    1.11  WGET_URL="http://icedtea.classpath.org/download/source/$TARBALL"
    1.12 @@ -46,6 +46,7 @@
    1.13  	cd $src
    1.14  	mkdir drops
    1.15  	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
    1.16 +	[ -L /usr/bin/wget ] && tazpkg get-install wget --forced
    1.17  	for i in $JAXWS $JAXP $JAF $OPENJDK ; do
    1.18  		if [ -f $SOURCES_REPOSITORY/$i ]; then
    1.19  			cp $SOURCES_REPOSITORY/$i drops
    1.20 @@ -68,10 +69,11 @@
    1.21  	[ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced
    1.22  	[ "$(readlink /usr/bin/awk)" == "gawk" ] ||
    1.23  	tazpkg get-install gawk --forced
    1.24 +	[ -L /usr/bin/sed ] && tazpkg get-install sed --forced
    1.25  	mem=$(free | awk '/Mem:/ { printf "%d\n",$2/1024 }')
    1.26  	cat > slitaz.sh <<EOT
    1.27  # Busybox compatibility
    1.28 -find -name Sanity.gmk | xargs sed -i 's/--sync -kP/-k/' Makefile 
    1.29 +#find -name Sanity.gmk | xargs sed -i 's/--sync -kP/-k/' Makefile 
    1.30  find -name Platform.gmk | xargs sed -i "s@MB_OF_MEMORY *:=.*free.*@MB_OF_MEMORY := $mem@" Makefile
    1.31  EOT
    1.32  	sed -i  -e 's|touch .*|&\n\tsh slitaz.sh|' \