wok-next rev 19570

Chapter 6: (linux-api-headers), man-pages, (glibc), zlib, (file), (binutils), gmp, mpfr, mpc-library, gcc, (bzip2), pkg-config, (ncurses), attr
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Dec 22 07:11:01 2016 +0200 (2016-12-22)
parents a6984f082794
children 8da249b2c8d7
files attr-dev/receipt attr/receipt gcc/receipt gmp-dev/receipt gmp/receipt man-pages/receipt mpc-library-dev/receipt mpc-library/receipt mpfr-dev/receipt mpfr/receipt pkg-config/receipt zlib-dev/receipt zlib/receipt zlib/stuff/zlib-1.2.5-lfs-decls.patch
line diff
     1.1 --- a/attr-dev/receipt	Thu Dec 22 00:25:33 2016 +0200
     1.2 +++ b/attr-dev/receipt	Thu Dec 22 07:11:01 2016 +0200
     1.3 @@ -7,17 +7,13 @@
     1.4  MAINTAINER="rcx@zoominternet.net"
     1.5  LICENSE="GPL2"
     1.6  WEB_SITE="http://savannah.nongnu.org/projects/attr/"
     1.7 -WANTED="attr"
     1.8  HOST_ARCH="i486 arm"
     1.9  
    1.10 +WANTED="attr"
    1.11  DEPENDS="attr"
    1.12  
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.14  genpkg_rules()
    1.15  {
    1.16 -	mkdir -p $fs/usr/lib $fs/lib
    1.17 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.18 -	( cd $fs/lib ; ln -s ../usr/lib/*a . )
    1.19 -	cp -a $install/usr/include $fs/usr
    1.20 -	find $fs -type f -name '*.la' -exec chmod a+x \{\} \;
    1.21 +	cook_copy_files *.h *.la
    1.22  }
     2.1 --- a/attr/receipt	Thu Dec 22 00:25:33 2016 +0200
     2.2 +++ b/attr/receipt	Thu Dec 22 07:11:01 2016 +0200
     2.3 @@ -6,13 +6,14 @@
     2.4  SHORT_DESC="Commands for Manipulating Filesystem Extended Attributes."
     2.5  MAINTAINER="rcx@zoominternet.net"
     2.6  LICENSE="GPL2"
     2.7 -WEB_SITE="http://savannah.nongnu.org/projects/attr/"
     2.8 -TARBALL="$PACKAGE-$VERSION.src.tar.gz"
     2.9 -WGET_URL="http://download.savannah.gnu.org/releases-noredirect/$PACKAGE/$TARBALL"
    2.10 +WEB_SITE="http://savannah.nongnu.org/projects/attr"
    2.11  HOST_ARCH="i486 arm"
    2.12  
    2.13 +TARBALL="$PACKAGE-$VERSION.src.tar.gz"
    2.14 +WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL"
    2.15 +
    2.16  DEPENDS="glibc-base"
    2.17 -BUILD_DEPENDS="autoconf automake m4 libtool gettext"
    2.18 +BUILD_DEPENDS="autoconf automake m4 libtool gettext coreutils-operations"
    2.19  
    2.20  # When cross compiling auto-tools, gettext and m4 build system are used.
    2.21  case "$ARCH" in
    2.22 @@ -22,27 +23,26 @@
    2.23  # Rules to configure and make the package.
    2.24  compile_rules()
    2.25  {
    2.26 -	# Need bash sh to compile
    2.27 -	mv /bin/sh /bin/sh.bak
    2.28 -	ln -s /bin/bash /bin/sh
    2.29 +	rm /bin/rpm
    2.30 +	sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in
    2.31  
    2.32 -	# No need to use rpm
    2.33 -	rm /bin/rpm
    2.34 -
    2.35 -	export INSTALL_USER=root INSTALL_GROUP=root
    2.36 -
    2.37 -	./configure $CONFIGURE_ARGS &&
    2.38 +	./configure \
    2.39 +		--bindir=/bin \
    2.40 +		--disable-static \
    2.41 +		$CONFIGURE_ARGS &&
    2.42  	make &&
    2.43  	make install install-lib install-dev DIST_ROOT=$DESTDIR
    2.44 -	
    2.45 -	mv -f /bin/sh.bak /bin/sh
    2.46 +
    2.47 +	mkdir -p $install/lib
    2.48 +	mv $install/usr/lib/libattr.so.* $install/lib
    2.49 +	ln -sf ../../lib/$(readlink $install/usr/lib/libattr.so) \
    2.50 +		$install/usr/lib/libattr.so
    2.51 +	find $install -type f \( -name '*.so*' -o -name '*.la' \) \
    2.52 +		-exec chmod 755 \{\} \;
    2.53  }
    2.54  
    2.55  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.56  genpkg_rules()
    2.57  {
    2.58 -	mkdir -p $fs/usr/lib
    2.59 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.60 -	cp -a $install/usr/bin $fs/usr
    2.61 -	find $fs -type f -name '*.so*' -exec chmod a+x \{\} \;
    2.62 +	cook_copy_files attr getfattr setfattr *.so*
    2.63  }
     3.1 --- a/gcc/receipt	Thu Dec 22 00:25:33 2016 +0200
     3.2 +++ b/gcc/receipt	Thu Dec 22 07:11:01 2016 +0200
     3.3 @@ -16,7 +16,7 @@
     3.4  # for cookutils that are not used by tazwok/cook-toolchain since it installs
     3.5  # and uses its own copy.
     3.6  DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils"
     3.7 -BUILD_DEPENDS="mpc-library mpfr-dev gmp-dev elfutils-dev zlib-dev"
     3.8 +BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
     3.9  
    3.10  # Handle cross compilation (native i486/ARM gcc)
    3.11  case "$ARCH" in
     4.1 --- a/gmp-dev/receipt	Thu Dec 22 00:25:33 2016 +0200
     4.2 +++ b/gmp-dev/receipt	Thu Dec 22 07:11:01 2016 +0200
     4.3 @@ -1,20 +1,19 @@
     4.4  # SliTaz package receipt
     4.5  
     4.6  PACKAGE="gmp-dev"
     4.7 -VERSION="6.0.0a"
     4.8 +VERSION="6.1.1"
     4.9  CATEGORY="development"
    4.10  SHORT_DESC="GNU Multiple Precision Arithmetic devel files."
    4.11  MAINTAINER="pankso@slitaz.org"
    4.12  LICENSE="GPL3"
    4.13 +WEB_SITE="https://gmplib.org/"
    4.14 +HOST_ARCH="i486 arm"
    4.15 +
    4.16  WANTED="gmp"
    4.17 -WEB_SITE="http://gmplib.org/"
    4.18 -HOST_ARCH="i486 arm"
    4.19 +DEPENDS="gmp"
    4.20  
    4.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.22  genpkg_rules()
    4.23  {
    4.24 -	mkdir -p $fs/usr/lib
    4.25 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    4.26 -	cp -a $install/usr/include $fs/usr
    4.27 +	cook_copy_files *.h *.la
    4.28  }
    4.29 -
     5.1 --- a/gmp/receipt	Thu Dec 22 00:25:33 2016 +0200
     5.2 +++ b/gmp/receipt	Thu Dec 22 07:11:01 2016 +0200
     5.3 @@ -1,32 +1,42 @@
     5.4  # SliTaz package receipt
     5.5  
     5.6  PACKAGE="gmp"
     5.7 -VERSION="6.0.0a"
     5.8 +VERSION="6.1.1"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="GNU Multiple Precision Arithmetic Library."
    5.11  MAINTAINER="pankso@slitaz.org"
    5.12  LICENSE="GPL3"
    5.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    5.14 -WEB_SITE="http://gmplib.org/"
    5.15 -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    5.16 +WEB_SITE="https://gmplib.org/"
    5.17  HOST_ARCH="i486 arm"
    5.18  
    5.19 -BUILD_DEPENDS="binutils m4"
    5.20 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    5.21 +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    5.22 +
    5.23 +BUILD_DEPENDS="binutils m4 ncurses-dev readline-dev texinfo"
    5.24  
    5.25  # Rules to configure and make the package.
    5.26  compile_rules()
    5.27  {
    5.28  	./configure \
    5.29  		--enable-cxx \
    5.30 +		--disable-static \
    5.31 +		--docdir=/usr/share/doc/gmp-$VERSION \
    5.32  		$CONFIGURE_ARGS &&
    5.33  	# -j > 1 make install fails.
    5.34 -	make && make -j 1 install
    5.35 +	make && make html && make install && make install-html
    5.36  }
    5.37  
    5.38  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.39  genpkg_rules()
    5.40  {
    5.41 -	mkdir -p $fs/usr/lib
    5.42 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    5.43 +	cook_copy_files *.so*
    5.44  }
    5.45  
    5.46 +testsuite()
    5.47 +{
    5.48 +	checklog=$(mktemp)
    5.49 +	make check 2>&1 | tee $checklog
    5.50 +	pass=$(awk '/# PASS:/{total+=$3} ; END{print total}' $checklog)
    5.51 +	echo "$pass / 190 tests passed"
    5.52 +	rm $checklog
    5.53 +}
     6.1 --- a/man-pages/receipt	Thu Dec 22 00:25:33 2016 +0200
     6.2 +++ b/man-pages/receipt	Thu Dec 22 07:11:01 2016 +0200
     6.3 @@ -1,12 +1,12 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="man-pages"
     6.7 -VERSION="4.06"
     6.8 +VERSION="4.07"
     6.9  CATEGORY="doc"
    6.10  SHORT_DESC="Linux manual pages"
    6.11  MAINTAINER="al.bobylev@gmail.com"
    6.12  LICENSE=""
    6.13 -WEB_SITE="http://www.kernel.org/doc/man-pages/"
    6.14 +WEB_SITE="https://www.kernel.org/doc/man-pages/"
    6.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.16  WGET_URL="https://www.kernel.org/pub/linux/docs/man-pages/$TARBALL"
    6.17  
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/mpc-library-dev/receipt	Thu Dec 22 07:11:01 2016 +0200
     7.3 @@ -0,0 +1,19 @@
     7.4 +# SliTaz package receipt.
     7.5 +
     7.6 +PACKAGE="mpc-library-dev"
     7.7 +VERSION="1.0.3"
     7.8 +CATEGORY="development"
     7.9 +SHORT_DESC="MPC is a C library for the arithmetic of complex numbers."
    7.10 +MAINTAINER="pankso@slitaz.org"
    7.11 +LICENSE="GPL2"
    7.12 +WEB_SITE="http://www.multiprecision.org/"
    7.13 +HOST_ARCH="i486 arm"
    7.14 +
    7.15 +WANTED="mpc-library"
    7.16 +DEPENDS="mpc-library mpfr-dev gmp-dev"
    7.17 +
    7.18 +# Rules to gen a SliTaz package suitable for Tazpkg.
    7.19 +genpkg_rules()
    7.20 +{
    7.21 +	cook_copy_files *.h *.la
    7.22 +}
     8.1 --- a/mpc-library/receipt	Thu Dec 22 00:25:33 2016 +0200
     8.2 +++ b/mpc-library/receipt	Thu Dec 22 07:11:01 2016 +0200
     8.3 @@ -6,28 +6,28 @@
     8.4  SHORT_DESC="MPC is a C library for the arithmetic of complex numbers."
     8.5  MAINTAINER="pankso@slitaz.org"
     8.6  LICENSE="GPL2"
     8.7 -SOURCE="mpc"
     8.8 -TARBALL="$SOURCE-$VERSION.tar.gz"
     8.9  WEB_SITE="http://www.multiprecision.org/"
    8.10 -WGET_URL="http://www.multiprecision.org/mpc/download/$TARBALL"
    8.11  HOST_ARCH="i486 arm"
    8.12  
    8.13 -#BUGS="Shared libs dont build with 0.9"
    8.14 +TARBALL="mpc-$VERSION.tar.gz"
    8.15 +WGET_URL="${WEB_SITE}mpc/download/$TARBALL"
    8.16  
    8.17  DEPENDS="mpfr gmp"
    8.18 -BUILD_DEPENDS="mpfr-dev gmp-dev"
    8.19 +BUILD_DEPENDS="mpfr-dev gmp-dev texinfo"
    8.20  
    8.21  compile_rules()
    8.22  {
    8.23  	#patch -Np1 -i $stuff/libmpc-0.9-configure_cflags_egrep_issue.patch
    8.24 -	./configure $CONFIGURE_ARGS && make && make install
    8.25 +
    8.26 +	./configure \
    8.27 +		--disable-static \
    8.28 +		--docdir=/usr/share/doc/mpc-$VERSION \
    8.29 +		$CONFIGURE_ARGS &&
    8.30 +	make && make html && make install && make install-html
    8.31  }
    8.32  
    8.33  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.34  genpkg_rules()
    8.35  {
    8.36 -	mkdir -p $fs/usr
    8.37 -	cp -a $install/usr/lib $fs/usr
    8.38 -	cp -a $install/usr/include $fs/usr
    8.39 +	cook_copy_files *.so*
    8.40  }
    8.41 -
     9.1 --- a/mpfr-dev/receipt	Thu Dec 22 00:25:33 2016 +0200
     9.2 +++ b/mpfr-dev/receipt	Thu Dec 22 07:11:01 2016 +0200
     9.3 @@ -6,10 +6,10 @@
     9.4  SHORT_DESC="GNU Multiple Precision Arithmetic devel files."
     9.5  MAINTAINER="pankso@slitaz.org"
     9.6  LICENSE="GPL3"
     9.7 -WANTED="mpfr"
     9.8  WEB_SITE="http://www.mpfr.org/"
     9.9  HOST_ARCH="i486 arm"
    9.10  
    9.11 +WANTED="mpfr"
    9.12  DEPENDS="mpfr"
    9.13  
    9.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    10.1 --- a/mpfr/receipt	Thu Dec 22 00:25:33 2016 +0200
    10.2 +++ b/mpfr/receipt	Thu Dec 22 07:11:01 2016 +0200
    10.3 @@ -6,13 +6,14 @@
    10.4  SHORT_DESC="C library for multiple-precision floating-point computations."
    10.5  MAINTAINER="pankso@slitaz.org"
    10.6  LICENSE="GPL3"
    10.7 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    10.8  WEB_SITE="http://www.mpfr.org/"
    10.9 -WGET_URL="http://www.mpfr.org/mpfr-current/$TARBALL"
   10.10  HOST_ARCH="i486 arm"
   10.11  
   10.12 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   10.13 +WGET_URL="http://www.mpfr.org/$PACKAGE-$VERSION/$TARBALL"
   10.14 +
   10.15  DEPENDS="gmp"
   10.16 -BUILD_DEPENDS="gmp-dev"
   10.17 +BUILD_DEPENDS="gmp-dev texinfo"
   10.18  
   10.19  #--with-gmp-lib=/cross/$ARCH/sysroot/usr/lib
   10.20  #--with-gmp-include=/cross/$ARCH/sysroot/usr/include
   10.21 @@ -20,19 +21,14 @@
   10.22  # Rules to configure and make the package.
   10.23  compile_rules()
   10.24  {
   10.25 -	patch -Np1 -i $stuff/mpfr-3.1.2-upstream_fixes-3.patch
   10.26 -	case "$ARCH" in
   10.27 -	i?86)
   10.28 -		./configure \
   10.29 -			--enable-thread-safe \
   10.30 -			$CONFIGURE_ARGS &&
   10.31 -		make && make check && make install ;;
   10.32 -	*)
   10.33 -		./configure \
   10.34 -			--enable-thread-safe \
   10.35 -			$CONFIGURE_ARGS &&
   10.36 -		make && make install ;;
   10.37 -	esac
   10.38 +#	patch -Np1 -i $stuff/mpfr-3.1.2-upstream_fixes-3.patch
   10.39 +
   10.40 +	./configure \
   10.41 +		--disable-static \
   10.42 +		--enable-thread-safe \
   10.43 +		--docdir=/usr/share/doc/mpfr-$VERSION \
   10.44 +		$CONFIGURE_ARGS &&
   10.45 +	make && make html && make install && make install-html
   10.46  }
   10.47  
   10.48  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.49 @@ -40,3 +36,8 @@
   10.50  {
   10.51  	cook_copy_files *.so*
   10.52  }
   10.53 +
   10.54 +testsuite()
   10.55 +{
   10.56 +	case "$ARCH" in i?86) make check;; esac
   10.57 +}
    11.1 --- a/pkg-config/receipt	Thu Dec 22 00:25:33 2016 +0200
    11.2 +++ b/pkg-config/receipt	Thu Dec 22 07:11:01 2016 +0200
    11.3 @@ -1,18 +1,19 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="pkg-config"
    11.7 -VERSION="0.28"
    11.8 +VERSION="0.29.1"
    11.9  CATEGORY="development"
   11.10  SHORT_DESC="Free desktop packages manager."
   11.11  MAINTAINER="pankso@slitaz.org"
   11.12  LICENSE="GPL2"
   11.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.14 -WEB_SITE="http://pkgconfig.freedesktop.org/wiki/"
   11.15 -WGET_URL="http://pkgconfig.freedesktop.org/releases/$TARBALL"
   11.16 +WEB_SITE="https://www.freedesktop.org/wiki/Software/pkg-config/"
   11.17  HOST_ARCH="i486 arm"
   11.18  
   11.19 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.20 +WGET_URL="https://pkg-config.freedesktop.org/releases/$TARBALL"
   11.21 +
   11.22  DEPENDS="glibc-base"
   11.23 -BUILD_DEPENDS="gcc libtool"
   11.24 +BUILD_DEPENDS="gcc libtool perl"
   11.25  
   11.26  # Handle cross compilation.
   11.27  case "$ARCH" in
   11.28 @@ -22,8 +23,9 @@
   11.29  # Rules to configure and make the package.
   11.30  compile_rules()
   11.31  {
   11.32 -	patch -p1 < $stuff/autoconf-2.66.patch
   11.33 -	sed -i 's/\$(LN) pkg-config\$(EXEEXT) \$(host_tool)/echo \1/' Makefile*
   11.34 +#	patch -p1 < $stuff/autoconf-2.66.patch
   11.35 +#	sed -i 's/\$(LN) pkg-config\$(EXEEXT) \$(host_tool)/echo \1/' Makefile*
   11.36 +
   11.37  	case "$ARCH" in
   11.38  		arm)
   11.39  			./configure \
   11.40 @@ -33,21 +35,24 @@
   11.41  				--cache-file=arm-linux.cache ;;
   11.42  		*)
   11.43  			./configure \
   11.44 -				--program-prefix=$TOOLPREFIX \
   11.45 +				--prefix=/usr \
   11.46 +				--with-internal-glib \
   11.47 +				--disable-compile-warnings \
   11.48 +				--disable-host-tool \
   11.49 +				--docdir=/usr/share/doc/pkg-config-$VERSION \
   11.50  				--build=$HOST_SYSTEM \
   11.51 -				--host=$HOST_SYSTEM 2>&1 | \
   11.52 -				grep -v './libtool: No such file' ;;
   11.53 +				--host=$HOST_SYSTEM
   11.54 +				;;
   11.55  	esac &&
   11.56  	make && make install
   11.57 +
   11.58 +	cd $install/usr/bin
   11.59 +	mv pkg-config ${TOOLPREFIX}pkg-config
   11.60 +	ln -s ${TOOLPREFIX}pkg-config pkg-config
   11.61  }
   11.62  
   11.63  # Rules to gen a SliTaz package suitable for Tazpkg.
   11.64  genpkg_rules()
   11.65  {
   11.66 -	mkdir -p $fs/usr/share
   11.67 -	cp -a $install/usr/bin $fs/usr
   11.68 -	cp -a $install/usr/share/aclocal $fs/usr/share
   11.69 -	# This is the default pkg-config so make a symling for package that dont
   11.70 -	# cross compile or search for /usr/bin/pkg-config.
   11.71 -	cd $fs/usr/bin && ln -s ${TOOLPREFIX}pkg-config pkg-config
   11.72 +	cook_copy_files *pkg-config *.m4
   11.73  }
    12.1 --- a/zlib-dev/receipt	Thu Dec 22 00:25:33 2016 +0200
    12.2 +++ b/zlib-dev/receipt	Thu Dec 22 07:11:01 2016 +0200
    12.3 @@ -6,17 +6,14 @@
    12.4  SHORT_DESC="Zlib compression library devel files."
    12.5  MAINTAINER="pankso@slitaz.org"
    12.6  LICENSE="zlib/libpng"
    12.7 -WANTED="zlib"
    12.8  WEB_SITE="http://zlib.net/"
    12.9  HOST_ARCH="i486 arm x86_64"
   12.10  
   12.11 +WANTED="zlib"
   12.12  DEPENDS="zlib pkg-config"
   12.13  
   12.14  # Rules to gen a SliTaz package suitable for Tazpkg.
   12.15  genpkg_rules()
   12.16  {
   12.17 -    mkdir -p $fs/usr/lib
   12.18 -    cp -a $install/usr/lib/*.*a $fs/usr/lib
   12.19 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   12.20 -	cp -a $install/usr/include $fs/usr
   12.21 +	cook_copy_files *.h *.a *.pc
   12.22  }
    13.1 --- a/zlib/receipt	Thu Dec 22 00:25:33 2016 +0200
    13.2 +++ b/zlib/receipt	Thu Dec 22 07:11:01 2016 +0200
    13.3 @@ -6,10 +6,11 @@
    13.4  SHORT_DESC="Compression library"
    13.5  MAINTAINER="pankso@slitaz.org"
    13.6  LICENSE="zlib/libpng"
    13.7 +WEB_SITE="http://www.zlib.net/"
    13.8 +HOST_ARCH="i486 arm x86_64"
    13.9 +
   13.10  TARBALL="$PACKAGE-$VERSION.tar.xz"
   13.11 -WEB_SITE="http://zlib.net"
   13.12 -WGET_URL="$SF_MIRROR/libpng/$TARBALL"
   13.13 -HOST_ARCH="i486 arm x86_64"
   13.14 +WGET_URL="$WEB_SITE$TARBALL"
   13.15  
   13.16  DEPENDS="glibc-base"
   13.17  BUILD_DEPENDS=""
   13.18 @@ -17,25 +18,30 @@
   13.19  # Rules to configure and make the package.
   13.20  compile_rules()
   13.21  {
   13.22 -	case "$ARCH" in
   13.23 -		i486)
   13.24 -			# work around gcc bug; see https://bugs.archlinux.org/task/20647
   13.25 -			export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" ;;
   13.26 -	esac
   13.27 -	./configure --prefix=/usr --shared &&
   13.28 -	make &&	make install
   13.29 +#	case "$ARCH" in
   13.30 +#		i486)
   13.31 +#			# work around gcc bug; see https://bugs.archlinux.org/task/20647
   13.32 +#			export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" ;;
   13.33 +#	esac
   13.34 +
   13.35 +	./configure --prefix=/usr &&
   13.36 +	make && make install
   13.37 +
   13.38 +	mkdir -p $install/lib
   13.39 +	mv -v $install/usr/lib/libz.so.* $install/lib
   13.40 +	ln -sf ../../lib/$(readlink $install/usr/lib/libz.so) \
   13.41 +		$install/usr/lib/libz.so
   13.42  }
   13.43  
   13.44  # Important cross compiled package so run readelf.
   13.45  testsuite()
   13.46  {
   13.47  	cd $install
   13.48 -	readelf -h usr/lib/*.so.$VERSION
   13.49 +	readelf -h lib/*.so.$VERSION
   13.50  }
   13.51  
   13.52  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.53  genpkg_rules()
   13.54  {
   13.55 -    mkdir -p $fs/usr/lib
   13.56 -    cp -a $install/usr/lib/libz.so* $fs/usr/lib
   13.57 +	cook_copy_files libz.so*
   13.58  }
    14.1 --- a/zlib/stuff/zlib-1.2.5-lfs-decls.patch	Thu Dec 22 00:25:33 2016 +0200
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,13 +0,0 @@
    14.4 -Index: zlib-1.2.5/zlib.h
    14.5 -===================================================================
    14.6 ---- zlib-1.2.5.orig/zlib.h
    14.7 -+++ zlib-1.2.5/zlib.h
    14.8 -@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
    14.9 - #  define gzoffset gzoffset64
   14.10 - #  define adler32_combine adler32_combine64
   14.11 - #  define crc32_combine crc32_combine64
   14.12 --#  ifdef _LARGEFILE64_SOURCE
   14.13 -+#  ifndef _LARGEFILE64_SOURCE
   14.14 -      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
   14.15 -      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
   14.16 -      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));