wok-next rev 21062
Update file (5.35), patch findutils for new glibc
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Dec 05 12:49:06 2018 +0200 (2018-12-05) |
parents | 1f4b1992db1f |
children | 11ce8ed30848 |
files | e2fsprogs/receipt file/receipt findutils/receipt |
line diff
1.1 --- a/e2fsprogs/receipt Wed Dec 05 09:14:46 2018 +0200 1.2 +++ b/e2fsprogs/receipt Wed Dec 05 12:49:06 2018 +0200 1.3 @@ -52,6 +52,9 @@ 1.4 # Remove illegal symbol '\b' 1.5 sed -i 's|\\b||' $src/po/de.po 1.6 msgfmt $src/po/de.po -o $src/po/de.gmo 1.7 + 1.8 + # Make symlinks relative 1.9 + fix symlinks 1.10 } 1.11 1.12 genpkg_rules() {
2.1 --- a/file/receipt Wed Dec 05 09:14:46 2018 +0200 2.2 +++ b/file/receipt Wed Dec 05 12:49:06 2018 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="file" 2.7 -VERSION="5.34" 2.8 +VERSION="5.35" 2.9 CATEGORY="system-tools" 2.10 SHORT_DESC="Determines file type using 'magic' numbers" 2.11 MAINTAINER="devel@slitaz.org" 2.12 @@ -12,8 +12,8 @@ 2.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.14 WGET_URL="https://github.com/file/file/archive/FILE${VERSION/./_}.tar.gz" 2.15 2.16 -BUILD_DEPENDS="automake libtool zlib-dev python" 2.17 -SPLIT="libmagic libmagic-dev python-magic" 2.18 +BUILD_DEPENDS="automake libtool zlib-dev python python3" 2.19 +SPLIT="libmagic libmagic-dev python-magic python3-magic" 2.20 2.21 compile_rules() { 2.22 autoreconf -f -i && 2.23 @@ -27,8 +27,12 @@ 2.24 rmdir --ignore-fail-on-non-empty $install/usr/share/man/man5/ 2.25 2.26 cd python 2.27 - python -B setup.py build && 2.28 - python -B setup.py install --root=$install 2.29 + python -B setup.py build && 2.30 + python -B setup.py install --root=$install || return 1 2.31 + 2.32 + python3 -B setup.py build && 2.33 + python3 -B setup.py install --root=$install 2.34 + 2.35 } 2.36 2.37 # Be sure it as cross compile. 2.38 @@ -53,7 +57,12 @@ 2.39 DEPENDS="libmagic" 2.40 ;; 2.41 python-magic) 2.42 - copy python*/ 2.43 + copy python2*/ 2.44 + CAT="development|Python bindings" 2.45 + DEPENDS="file python" 2.46 + ;; 2.47 + python3-magic) 2.48 + copy python3*/ 2.49 CAT="development|Python bindings" 2.50 DEPENDS="file python" 2.51 ;;
3.1 --- a/findutils/receipt Wed Dec 05 09:14:46 2018 +0200 3.2 +++ b/findutils/receipt Wed Dec 05 12:49:06 2018 +0200 3.3 @@ -12,16 +12,18 @@ 3.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.5 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 3.6 3.7 +DEPENDS_std="glibc-base slitaz-base-files" 3.8 +TAGS_std="LFS" 3.9 + 3.10 compile_rules() { 3.11 + # for glibc-2.28 (from LFS): 3.12 + sed -i 's|IO_ftrylockfile|IO_EOF_SEEN|' gl/lib/*.c 3.13 + sed -i '/unistd/a #include <sys/sysmacros.h>' gl/lib/mountlist.c 3.14 + echo '#define _IO_IN_BACKUP 0x100' >> gl/lib/stdio-impl.h 3.15 + 3.16 ./configure \ 3.17 --localstatedir=/var/lib/locate \ 3.18 $CONFIGURE_ARGS && 3.19 make && 3.20 make install 3.21 } 3.22 - 3.23 -genpkg_rules() { 3.24 - copy @std 3.25 - DEPENDS="glibc-base slitaz-base-files" 3.26 - TAGS="LFS" 3.27 -}