wok-next diff gcc+gcj/receipt @ rev 21025

Update tzdata (2018g)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Nov 03 04:10:29 2018 +0200 (2018-11-03)
parents f48456621a9d
children aa1e58c82d61
line diff
     1.1 --- a/gcc+gcj/receipt	Tue Oct 16 16:46:05 2018 +0300
     1.2 +++ b/gcc+gcj/receipt	Sat Nov 03 04:10:29 2018 +0200
     1.3 @@ -1,40 +1,32 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="gcc+gcj"
     1.7 -SOURCE="gcc"
     1.8  VERSION="4.6.3"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="The GNU Compiler Collection, including the gcj Compiler for Java."
    1.11 -MAINTAINER="rcx@zoominternet.net"
    1.12 +SHORT_DESC="The GNU Compiler Collection, including the gcj Compiler for Java"
    1.13 +MAINTAINER="devel@slitaz.org"
    1.14  LICENSE="GPL2"
    1.15 -WEB_SITE="http://gcc.gnu.org/java/"
    1.16 +WEB_SITE="https://gcc.gnu.org/"
    1.17  REPOLOGY="gcc"
    1.18  
    1.19 -TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.20 -WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
    1.21 +TARBALL="gcc-$VERSION.tar.bz2"
    1.22 +WGET_URL="$GNU_MIRROR/gcc/gcc-$VERSION/$TARBALL"
    1.23  
    1.24  ECJ_JAR="ecj-latest.jar"
    1.25  ECJ_URL="ftp://sourceware.org/pub/java/$ECJ_JAR"
    1.26  EXTRA_SOURCE_FILES="$ECJ_JAR"
    1.27 -PROVIDE="$SOURCE jre jdk"
    1.28 +PROVIDE="gcc jre jdk"
    1.29  TAGS="compiler C C++ objective-C java"
    1.30  
    1.31 -DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr python \
    1.32 -gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 xorg-libxcb xorg-xcb-util \
    1.33 -xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
    1.34 -xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
    1.35 -xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst alsa-lib elfutils"
    1.36  BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev mpc-library \
    1.37  expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorg-xorgproto \
    1.38  xorg-libXtst \
    1.39  elfutils elfutils-dev util-linux-uuid-dev"
    1.40  
    1.41 -# Rules to configure and make the package.
    1.42 -compile_rules()
    1.43 -{
    1.44 +compile_rules() {
    1.45  	sed -i 's/@mkdir_p@/mkdir -p/' libjava/classpath/lib/copy-vmresources.sh.in
    1.46  	# Set HOST_SYSTEM if not defined in tazwok.conf as it should be
    1.47 -	if [ -z "$HOST_SYSTEM" ] ; then
    1.48 +	if [ -z "$HOST_SYSTEM" ]; then
    1.49  		HOST_SYSTEM="$ARCH-slitaz-linux"
    1.50  	fi
    1.51  	GCC_TARGET=$HOST_SYSTEM
    1.52 @@ -42,11 +34,11 @@
    1.53  	# Get ecj.jar needed to build gcj. We have to dl it each time from the
    1.54  	# sources repository to ensure that we receive the latest JAR.
    1.55  	# (See http://gcc.gnu.org/install/configure.html --with-ecj-jar)
    1.56 -	if [ ! -f "$ECJ_JAR" ] ; then
    1.57 +	if [ ! -f "$ECJ_JAR" ]; then
    1.58  		echo "Downloading ECJ jar to: $(pwd)"
    1.59  		wget -c $ECJ_URL
    1.60  		# Exit if download failed to avoid errors.
    1.61 -		if [ ! -f "$ECJ_JAR" ] ; then
    1.62 +		if [ ! -f "$ECJ_JAR" ]; then
    1.63  			echo -e "\nECJ jar download failed, exiting. Please check ECJ_URL variable.\n"
    1.64  			return 1
    1.65  		fi
    1.66 @@ -58,30 +50,40 @@
    1.67  		$src/libiberty/Makefile.in || return 1
    1.68  	mkdir -p ../build && cd ../build
    1.69  
    1.70 -	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
    1.71 -	../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \
    1.72 -		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
    1.73 -		--enable-languages=c,c++,objc,java --enable-shared \
    1.74 +	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')	#'
    1.75 +
    1.76 +	../${src##*/}/configure \
    1.77 +		--prefix=/usr \
    1.78 +		--libexecdir=/usr/lib \
    1.79 +		--infodir=/usr/share/info \
    1.80 +		--mandir=/usr/share/man \
    1.81 +		--enable-nls \
    1.82 +		--enable-languages=c,c++,objc,java \
    1.83 +		--enable-shared \
    1.84  		--with-system-zlib \
    1.85 -		--enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \
    1.86 -		--enable-threads=posix --with-tune=$ARCH \
    1.87 -		--enable-java-home --with-arch-directory=i386 \
    1.88 +		--enable-clocale=gnu \
    1.89 +		--enable-objc-gc \
    1.90 +		--enable-__cxa_atexit \
    1.91 +		--enable-threads=posix \
    1.92 +		--with-tune=$ARCH \
    1.93 +		--enable-java-home \
    1.94 +		--with-arch-directory=i386 \
    1.95  		--with-jvm-root-dir=/usr/lib/jvm/java-gcj \
    1.96  		--with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \
    1.97  		--with-python-dir=/usr/lib/$PYTHON_LIB/site-packages \
    1.98 -		--with-x --enable-java-awt=gtk \
    1.99 +		--with-x \
   1.100 +		--enable-java-awt=gtk \
   1.101  		--enable-gtk-cairo \
   1.102  		--enable-lto \
   1.103 -		$CONFIGURE_ARGS $GCC_TARGET  &&
   1.104 +		$GCC_TARGET \
   1.105 +		$CONFIGURE_ARGS &&
   1.106  	make bootstrap &&
   1.107  	# Make install in the source tree to help creating derived pkgs
   1.108  	# and keep $_pkg variable set for genpkg.
   1.109  	make install
   1.110  }
   1.111  
   1.112 -# Rules to gen a SliTaz package suitable for Tazpkg.
   1.113 -genpkg_rules()
   1.114 -{
   1.115 +genpkg_rules() {
   1.116  	mkdir -p  $fs/usr/share
   1.117  	cp -a $install/usr/share/java $fs/usr/share
   1.118  	cp -a $install/usr/bin $fs/usr
   1.119 @@ -95,15 +97,19 @@
   1.120  	rm $fs/usr/lib/*.la
   1.121  	# Include files.
   1.122  	cp -a $install/usr/include $fs/usr
   1.123 +	DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr \
   1.124 +	python gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 \
   1.125 +	xorg-libxcb xorg-xcb-util xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
   1.126 +	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
   1.127 +	xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
   1.128 +	xorg-libXtst alsa-lib elfutils"
   1.129  }
   1.130  
   1.131 -# Post install commands for Tazpkg.
   1.132 -post_install()
   1.133 -{
   1.134 -	if [ ! -f "$1/lib/cpp" ] ; then
   1.135 +post_install() {
   1.136 +	if [ ! -f "$1/lib/cpp" ]; then
   1.137  		ln -s ../usr/bin/cpp "$1/lib"
   1.138  	fi
   1.139 -	if [ ! -f "$1/usr/bin/cc" ] ; then
   1.140 +	if [ ! -f "$1/usr/bin/cc" ]; then
   1.141  		ln -s gcc "$1/usr/bin/cc"
   1.142  	fi
   1.143  }