wok-next rev 19577

glibc: update bdeps; up: e2fsprogs.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Dec 26 01:30:19 2016 +0200 (2016-12-26)
parents 01b295f47e95
children 12dc3b9e499d
files e2fsprogs-dev/receipt e2fsprogs/receipt e2fsprogs/stuff/libcomerr-dev.files-list e2fsprogs/stuff/libcomerr.files-list glibc-base/receipt glibc/receipt libcomerr-dev/receipt libcomerr/receipt libtic/receipt procps-ng-dev/receipt
line diff
     1.1 --- a/e2fsprogs-dev/receipt	Sun Dec 25 05:00:00 2016 +0200
     1.2 +++ b/e2fsprogs-dev/receipt	Mon Dec 26 01:30:19 2016 +0200
     1.3 @@ -1,33 +1,20 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="e2fsprogs-dev"
     1.7 -VERSION="1.42.12"
     1.8 +VERSION="1.43.1"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="The e2fsprogs devel files."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 -WANTED="e2fsprogs"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="http://e2fsprogs.sourceforge.net/"
    1.15  HOST_ARCH="i486 arm"
    1.16  
    1.17 +WANTED="e2fsprogs"
    1.18  DEPENDS="libcomerr-dev pkg-config"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21  genpkg_rules()
    1.22  {
    1.23 -	mkdir -p $fs/usr/lib
    1.24 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.25 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.26 -	cp -a $install/usr/include $fs/usr
    1.27 -	cat $wanted_stuff/*.files-list | while read file; do
    1.28 -		[ -f ${fs}$file ] && rm -f ${fs}$file
    1.29 -	done
    1.30 -	# Remove blkid files.
    1.31 -	rm -rf $fs/usr/include/blkid
    1.32 -	rm -rf $fs/usr/lib/libblkid*
    1.33 -	rm -rf $fs/usr/lib/pkgconfig/blkid.pc
    1.34 -	# Remove uuid files.
    1.35 -	rm -rf $fs/usr/include/uuid
    1.36 -	rm -rf $fs/usr/lib/libuuid*
    1.37 -	rm -rf $fs/usr/lib/pkgconfig/uuid.pc
    1.38 +	cook_copy_files *.h *.a *.pc
    1.39 +	cook_split_rm libcomerr libcomerr-dev
    1.40  }
     2.1 --- a/e2fsprogs/receipt	Sun Dec 25 05:00:00 2016 +0200
     2.2 +++ b/e2fsprogs/receipt	Mon Dec 26 01:30:19 2016 +0200
     2.3 @@ -1,18 +1,21 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="e2fsprogs"
     2.7 -VERSION="1.42.12"
     2.8 +VERSION="1.43.1"
     2.9  CATEGORY="base-system"
    2.10  SHORT_DESC="Filesystem utilities for use with ext2 and ext3 (without fsck*)."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  LICENSE="GPL2"
    2.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.14  WEB_SITE="http://e2fsprogs.sourceforge.net/"
    2.15 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.16  HOST_ARCH="i486 arm"
    2.17  
    2.18 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.19 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.20 +
    2.21  DEPENDS="libcomerr util-linux-blkid util-linux-uuid"
    2.22 -BUILD_DEPENDS="texinfo"
    2.23 +BUILD_DEPENDS="util-linux-uuid-dev util-linux-blkid-dev gettext attr-dev \
    2.24 +acl-dev texinfo"
    2.25 +SPLIT="libcomerr libcomerr-dev e2fsprogs-dev"
    2.26  
    2.27  # Handle cross compilation.
    2.28  case "$ARCH" in
    2.29 @@ -22,48 +25,59 @@
    2.30  # Rules to configure and make the package.
    2.31  compile_rules()
    2.32  {
    2.33 +	sed -i -e 's:\[\.-\]::' tests/filter.sed
    2.34  	mkdir ../build && cd ../build
    2.35 +
    2.36  	$src/configure \
    2.37 -		--prefix=/usr \
    2.38 +		--bindir=/bin \
    2.39 +		--sysconfdir=/etc \
    2.40  		--with-root-prefix="" \
    2.41  		--enable-elf-shlibs \
    2.42 -		--sysconfdir=/etc \
    2.43 -		$CONFIGURE_ARGS
    2.44 -	make && make install &&
    2.45 -	make install-libs
    2.46 +		--disable-libblkid \
    2.47 +		--disable-libuuid \
    2.48 +		--disable-uuidd \
    2.49 +		--disable-fsck \
    2.50 +		$CONFIGURE_ARGS &&
    2.51 +	make && make install && make install-libs
    2.52 +
    2.53 +	for i in libcom_err libe2p libext2fs libss; do
    2.54 +		chmod u+w $install/usr/lib/$i.a
    2.55 +	done
    2.56 +
    2.57 +	# Make .info usable
    2.58 +	gunzip $install/usr/share/info/libext2fs.info.gz
    2.59 +	install-info --dir-file=$install/usr/share/info/dir \
    2.60 +		$install/usr/share/info/libext2fs.info
    2.61 +
    2.62 +	# Additional documentation
    2.63 +	makeinfo -o      $src/doc/com_err.info $src/lib/et/com_err.texinfo
    2.64 +	install -m644 $src/doc/com_err.info $install/usr/share/info
    2.65 +	install-info --dir-file=$install/usr/share/info/dir \
    2.66 +		$install/usr/share/info/com_err.info
    2.67 +
    2.68 +	# Remove illegal symbol '\b'
    2.69 +	sed -i 's|\\b||' $src/po/de.po
    2.70 +	msgfmt $src/po/de.po -o $src/po/de.gmo
    2.71  }
    2.72  
    2.73  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.74  genpkg_rules()
    2.75  {
    2.76 -	mkdir -p $fs/usr/lib
    2.77 -	cp -a $install/sbin $fs
    2.78 -	cp -a $install/lib $fs
    2.79 -	cp -a $install/etc $fs
    2.80 -	cp -a $install/usr/bin $fs/usr
    2.81 -	cp -a $install/usr/sbin $fs/usr
    2.82 -	cp -a $install/usr/lib/*.so $fs/usr/lib
    2.83 -	cat $stuff/*.files-list | while read file; do
    2.84 -		rm -f ${fs}$file
    2.85 -	done
    2.86 +	cook_copy_folders bin sbin etc
    2.87 +	cook_copy_files *.so*
    2.88 +	# Split -> libcomerr
    2.89 +	find $fs -name 'libcom_err*' -delete
    2.90  	# Remove fsck provided by Busybox.
    2.91 -	rm $fs/sbin/fsck* $fs/sbin/blkid
    2.92 -	# Remove blkid provided by util-linux.
    2.93 -	rm $fs/lib/libblkid* $fs/usr/lib/libblkid*
    2.94 -	# Remove uuid files provided by util-linux.
    2.95 -	rm $fs/usr/sbin/uuidd $fs/usr/bin/uuidgen
    2.96 -	rm $fs/lib/libuuid* $fs/usr/lib/libuuid*
    2.97 +	rm $fs/sbin/fsck*
    2.98  }
    2.99  
   2.100  # Overlap busybox
   2.101  pre_install()
   2.102  {
   2.103 -	rm -f $root/sbin/findfs
   2.104 -	rm -f $root/sbin/tune2fs
   2.105 +	rm -f $1/sbin/tune2fs
   2.106  }
   2.107  
   2.108  post_remove()
   2.109  {
   2.110 -	ln -s /bin/busybox $root/sbin/findfs
   2.111 -	ln -s /bin/busybox $root/sbin/tune2fs
   2.112 +	ln -s /bin/busybox $1/sbin/tune2fs
   2.113  }
     3.1 --- a/e2fsprogs/stuff/libcomerr-dev.files-list	Sun Dec 25 05:00:00 2016 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,5 +0,0 @@
     3.4 -/usr/lib/libcom_err.a
     3.5 -/usr/lib/pkgconfig/com_err.pc
     3.6 -/usr/include/et/com_err.h
     3.7 -/usr/share/et
     3.8 -/usr/share/ss
     4.1 --- a/e2fsprogs/stuff/libcomerr.files-list	Sun Dec 25 05:00:00 2016 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,3 +0,0 @@
     4.4 -/lib/libcom_err.so.2.1
     4.5 -/lib/libcom_err.so.2
     4.6 -/usr/lib/libcom_err.so
     5.1 --- a/glibc-base/receipt	Sun Dec 25 05:00:00 2016 +0200
     5.2 +++ b/glibc-base/receipt	Mon Dec 26 01:30:19 2016 +0200
     5.3 @@ -138,14 +138,6 @@
     5.4  				\
     5.5  				locale localedef locale.alias UTF-8.gz UTC rpc \
     5.6  				$DEFAULT_LOCALE
     5.7 -
     5.8 -#			# Copy all files specified in stuff/files.list. We get the files
     5.9 -#			# from glibc package.
    5.10 -#			for file in $(cat $stuff/wanted-files.list)
    5.11 -#			do
    5.12 -#				cp -a ${install}$file ${fs}$file
    5.13 -#			done
    5.14 -#			get_locales "usr/share"
    5.15  	esac
    5.16  }
    5.17  
     6.1 --- a/glibc/receipt	Sun Dec 25 05:00:00 2016 +0200
     6.2 +++ b/glibc/receipt	Mon Dec 26 01:30:19 2016 +0200
     6.3 @@ -12,26 +12,13 @@
     6.4  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     6.5  
     6.6  DEPENDS="glibc-base glibc-locale glibc-dev"
     6.7 -BUILD_DEPENDS="linux-api-headers autoconf bash advancecomp  \
     6.8 -gawk gettext-tools bison"
     6.9 -
    6.10 -# Genpkg order for tazwok.
    6.11 -COOK_OPT="genpkg=glibc-base:glib-locale:glibc-dev"
    6.12 +BUILD_DEPENDS="linux-api-headers autoconf bash advancecomp gawk gettext bison \
    6.13 +texinfo"
    6.14 +SPLIT="glibc-base glibc-locale-glibc-dev"
    6.15  
    6.16  # Rules to compile & install the temporary toolchain.
    6.17  cook_tmp_toolchain()
    6.18  {
    6.19 -#	# Glibc Bug Fixes Patch from LFS
    6.20 -#	patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch
    6.21 -#	# Glibc Bug Sort Relocatable Objects Patch
    6.22 -#	patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
    6.23 -#	# Fix a bug that prevents Glibc from building with GCC-4.6.2
    6.24 -#	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
    6.25 -#	# GHOST
    6.26 -#	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
    6.27 -
    6.28 -	# glibc no longer support i386, so use -march=i486 for better compatibility.
    6.29 -	# If i686 ???
    6.30  	unset CFLAGS CXXFLAGS
    6.31  	case $ARCH in
    6.32  		i386|i486)
    6.33 @@ -59,60 +46,20 @@
    6.34  	} || return 1
    6.35  
    6.36  	# Link compiler to this new glibc.
    6.37 -	SPECS=`dirname $($HOST_SYSTEM-gcc -print-libgcc-file-name)`/specs
    6.38 +	SPECS=$(dirname $($HOST_SYSTEM-gcc -print-libgcc-file-name))/specs
    6.39  	$HOST_SYSTEM-gcc -dumpspecs | sed \
    6.40  		-e 's@/lib\(64\)\?/ld@/tools&@g' \
    6.41 -		-e "/^\*cpp:$/{n;s,$, -isystem /tools/include,}" > $SPECS 
    6.42 +		-e "/^\*cpp:$/{n;s,$, -isystem /tools/include,}" > $SPECS
    6.43  	unset SPECS
    6.44  }
    6.45  
    6.46  # Rules to configure and make the package.
    6.47  compile_rules()
    6.48  {
    6.49 -#	# SliTaz is a Busybox based OS, why we so small and fast. Using gawk by
    6.50 -#	# default to build package will not ensure package work with Busybox awk
    6.51 -#	# and so should NOT be use to cook.
    6.52 -#	if [ -x /usr/bin/cook ]; then
    6.53 -#		[ -d "/var/lib/tazpkg/installed/gawk" ] || tazpkg get-install gawk
    6.54 -#	fi
    6.55 -
    6.56 -#	# Make 4.x support...
    6.57 -#	sed -i 's/3\.79/4.* | &/' configure*
    6.58 -#	# Fixes and patches from LFS, Redhat
    6.59 -#	sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl
    6.60 -#	sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
    6.61 -
    6.62 -#	# Glibc misc Bug Fixes
    6.63 -#	patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch
    6.64 -
    6.65 -#	# Glibc Bug Sort Relocatable Objects Patch
    6.66 -#	#patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
    6.67 -
    6.68 -#	# Fix a bug that prevents Glibc from building with GCC-4.6.2
    6.69 -#	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
    6.70 -
    6.71 -#	# Revert commit causing issues with crappy DNS servers
    6.72 -#	patch -Np1 -i $stuff/glibc-2.14-revert-4768ae77.patch
    6.73 -
    6.74 -#	# re-export RPC interface until libtirpc is ready as a replacement
    6.75 -#	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
    6.76 -#	patch -Np1 -i $stuff/glibc-2.14-reexport-rpc-interface.patch
    6.77 -#	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
    6.78 -#	patch -Np1 -i $stuff/glibc-2.14-reinstall-nis-rpc-headers.patch
    6.79 -#	# GHOST
    6.80 -#	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
    6.81 -
    6.82 -#	# Fix a stack imbalance that occurs under some conditions:
    6.83 -#	sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
    6.84 -#		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S \
    6.85 -#		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
    6.86 -
    6.87  	# Glibc needs ld.so.conf in the install destdir.
    6.88  	mkdir -p $WOK/$PACKAGE/install/etc
    6.89  	touch    $WOK/$PACKAGE/install/etc/ld.so.conf
    6.90  
    6.91 -#	mkdir ../glibc-build && cd ../glibc-build
    6.92 -
    6.93  	# Read the INSTALL file in glibc. Also Glibc dont build with -Os flag.
    6.94  	# --enale-kernel use latest SliTaz Kernel version. From Glibc INSTALL:
    6.95  	# "The higher the VERSION number is, the less compatibility code is
    6.96 @@ -142,20 +89,28 @@
    6.97  		make -j1 && make install_root=$DESTDIR install
    6.98  	} || return 1
    6.99  
   6.100 -	for i in $DESTDIR/usr/share/i18n/charmaps/*.gz ; do
   6.101 -		advdef -z4 $i
   6.102 +	action 'Recompress charmaps...'
   6.103 +	local size0=$(ls -l $install/usr/share/i18n/charmaps/*.gz | awk '{s+=$5}END{print s}')
   6.104 +	local time0=$(date +%s)
   6.105 +	for i in $install/usr/share/i18n/charmaps/*.gz; do
   6.106 +		advdef -z4q $i
   6.107  	done
   6.108 +	local size1=$(ls -l $install/usr/share/i18n/charmaps/*.gz | awk '{s+=$5}END{print s}')
   6.109 +	local time1=$(date +%s)
   6.110 +	status
   6.111 +	comp_summary "$time0" "$time1" "$size0" "$size1"
   6.112  
   6.113  	# If temporary toolchain was previously used, switch to regular toolchain.
   6.114 -	[ -d /tools ] || return
   6.115 -	mv /tools/bin/ld /tools/bin/ld-old
   6.116 -	mv /tools/$(gcc -dumpmachine)/bin/ld /tools/$(gcc -dumpmachine)/bin/ld-old
   6.117 -	mv /tools/bin/ld-new /tools/bin/ld
   6.118 -	ln -s /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld
   6.119 -	gcc -dumpspecs | sed -e 's@/tools@@g' \
   6.120 -		-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
   6.121 -		-e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \
   6.122 -		`dirname $(gcc --print-libgcc-file-name)`/specs
   6.123 +	if [ ! -d /tools ]; then
   6.124 +		mv /tools/bin/ld /tools/bin/ld-old
   6.125 +		mv /tools/$(gcc -dumpmachine)/bin/ld /tools/$(gcc -dumpmachine)/bin/ld-old
   6.126 +		mv /tools/bin/ld-new /tools/bin/ld
   6.127 +		ln -s /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld
   6.128 +		gcc -dumpspecs | sed -e 's@/tools@@g' \
   6.129 +			-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
   6.130 +			-e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \
   6.131 +			$(dirname $(gcc --print-libgcc-file-name))/specs
   6.132 +	fi
   6.133  }
   6.134  
   6.135  # Rules to gen a SliTaz package suitable for Tazpkg.
   6.136 @@ -164,10 +119,7 @@
   6.137  	LOCALE=""
   6.138  	mkdir -p $fs/var
   6.139  
   6.140 -#	# Remove build directory.
   6.141 -#	rm -rf $WOK/$PACKAGE/source/$PACKAGE-build
   6.142 -#	rm -rf $WOK/$PACKAGE/$PACKAGE-build
   6.143 -
   6.144  	# check install
   6.145  	ls $install/lib/ | tr '\n' ' ' | fold -s
   6.146 +	echo
   6.147  }
     7.1 --- a/libcomerr-dev/receipt	Sun Dec 25 05:00:00 2016 +0200
     7.2 +++ b/libcomerr-dev/receipt	Mon Dec 26 01:30:19 2016 +0200
     7.3 @@ -1,23 +1,21 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="libcomerr-dev"
     7.7 -VERSION="1.42.12"
     7.8 +VERSION="1.43.1"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="The libcomerr devel files."
    7.11  MAINTAINER="pankso@slitaz.org"
    7.12  LICENSE="GPL2"
    7.13 -WANTED="e2fsprogs"
    7.14  WEB_SITE="http://e2fsprogs.sourceforge.net/"
    7.15  HOST_ARCH="i486 arm"
    7.16  
    7.17 +WANTED="e2fsprogs"
    7.18  DEPENDS="pkg-config"
    7.19  
    7.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.21  genpkg_rules()
    7.22  {
    7.23 -	while read file; do
    7.24 -		dir=$(dirname $file)
    7.25 -		[ -d ${fs}$dir ] || mkdir -p ${fs}$dir
    7.26 -		cp -a ${install}$file ${fs}$file
    7.27 -	done < $wanted_stuff/$PACKAGE.files-list
    7.28 +	cook_copy_folders et
    7.29 +	cook_copy_files libcom_err.h libcom_err.a libcom_err.pc
    7.30 +	ln $fs/usr/include/et/com_err.h $fs/usr/include/com_err.h
    7.31  }
     8.1 --- a/libcomerr/receipt	Sun Dec 25 05:00:00 2016 +0200
     8.2 +++ b/libcomerr/receipt	Mon Dec 26 01:30:19 2016 +0200
     8.3 @@ -1,21 +1,18 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="libcomerr"
     8.7 -VERSION="1.42.12"
     8.8 +VERSION="1.43.1"
     8.9  CATEGORY="base-system"
    8.10  SHORT_DESC="The libcomerr library files."
    8.11  MAINTAINER="pankso@slitaz.org"
    8.12  LICENSE="GPL2"
    8.13 -WANTED="e2fsprogs"
    8.14  WEB_SITE="http://e2fsprogs.sourceforge.net/"
    8.15  HOST_ARCH="i486 arm"
    8.16  
    8.17 +WANTED="e2fsprogs"
    8.18 +
    8.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.20  genpkg_rules()
    8.21  {
    8.22 -	while read file; do
    8.23 -		dir=$(dirname $file)
    8.24 -		[ -d ${fs}$dir ] || mkdir -p ${fs}$dir
    8.25 -		cp -a ${install}$file ${fs}$file
    8.26 -	done < $wanted_stuff/$PACKAGE.files-list
    8.27 +	cook_copy_files libcom_err.so*
    8.28  }
     9.1 --- a/libtic/receipt	Sun Dec 25 05:00:00 2016 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,18 +0,0 @@
     9.4 -# SliTaz package receipt.
     9.5 -
     9.6 -PACKAGE="libtic"
     9.7 -VERSION="5.9"
     9.8 -CATEGORY="development"
     9.9 -SHORT_DESC="Low-level terminfo library."
    9.10 -MAINTAINER="pascal.bellard@slitaz.org"
    9.11 -LICENSE="MIT"
    9.12 -WANTED="ncurses"
    9.13 -WEB_SITE="http://invisible-island.net/ncurses/"
    9.14 -HOST_ARCH="i486 arm"
    9.15 -
    9.16 -# Rules to gen a SliTaz package suitable for Tazpkg.
    9.17 -genpkg_rules()
    9.18 -{
    9.19 -	mkdir -p $fs/lib
    9.20 -	cp -a $install/lib/libtic*.so* $fs/lib
    9.21 -}
    10.1 --- a/procps-ng-dev/receipt	Sun Dec 25 05:00:00 2016 +0200
    10.2 +++ b/procps-ng-dev/receipt	Mon Dec 26 01:30:19 2016 +0200
    10.3 @@ -2,7 +2,7 @@
    10.4  
    10.5  PACKAGE="procps-ng-dev"
    10.6  VERSION="3.3.12"
    10.7 -CATEGORY="developmen"
    10.8 +CATEGORY="development"
    10.9  SHORT_DESC="Programs for monitoring processes (development files)"
   10.10  MAINTAINER="al.bobylev@gmail.com"
   10.11  LICENSE="GPL2 LGPL2"