# HG changeset patch # User Aleksej Bobylev # Date 1544006946 -7200 # Node ID add40df8725d58fae4cd97979a7a02edbc884cd1 # Parent 1f4b1992db1f2cd6b80b710baea149a9b1475e02 Update file (5.35), patch findutils for new glibc diff -r 1f4b1992db1f -r add40df8725d e2fsprogs/receipt --- a/e2fsprogs/receipt Wed Dec 05 09:14:46 2018 +0200 +++ b/e2fsprogs/receipt Wed Dec 05 12:49:06 2018 +0200 @@ -52,6 +52,9 @@ # Remove illegal symbol '\b' sed -i 's|\\b||' $src/po/de.po msgfmt $src/po/de.po -o $src/po/de.gmo + + # Make symlinks relative + fix symlinks } genpkg_rules() { diff -r 1f4b1992db1f -r add40df8725d file/receipt --- a/file/receipt Wed Dec 05 09:14:46 2018 +0200 +++ b/file/receipt Wed Dec 05 12:49:06 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="file" -VERSION="5.34" +VERSION="5.35" CATEGORY="system-tools" SHORT_DESC="Determines file type using 'magic' numbers" MAINTAINER="devel@slitaz.org" @@ -12,8 +12,8 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/file/file/archive/FILE${VERSION/./_}.tar.gz" -BUILD_DEPENDS="automake libtool zlib-dev python" -SPLIT="libmagic libmagic-dev python-magic" +BUILD_DEPENDS="automake libtool zlib-dev python python3" +SPLIT="libmagic libmagic-dev python-magic python3-magic" compile_rules() { autoreconf -f -i && @@ -27,8 +27,12 @@ rmdir --ignore-fail-on-non-empty $install/usr/share/man/man5/ cd python - python -B setup.py build && - python -B setup.py install --root=$install + python -B setup.py build && + python -B setup.py install --root=$install || return 1 + + python3 -B setup.py build && + python3 -B setup.py install --root=$install + } # Be sure it as cross compile. @@ -53,7 +57,12 @@ DEPENDS="libmagic" ;; python-magic) - copy python*/ + copy python2*/ + CAT="development|Python bindings" + DEPENDS="file python" + ;; + python3-magic) + copy python3*/ CAT="development|Python bindings" DEPENDS="file python" ;; diff -r 1f4b1992db1f -r add40df8725d findutils/receipt --- a/findutils/receipt Wed Dec 05 09:14:46 2018 +0200 +++ b/findutils/receipt Wed Dec 05 12:49:06 2018 +0200 @@ -12,16 +12,18 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" +DEPENDS_std="glibc-base slitaz-base-files" +TAGS_std="LFS" + compile_rules() { + # for glibc-2.28 (from LFS): + sed -i 's|IO_ftrylockfile|IO_EOF_SEEN|' gl/lib/*.c + sed -i '/unistd/a #include ' gl/lib/mountlist.c + echo '#define _IO_IN_BACKUP 0x100' >> gl/lib/stdio-impl.h + ./configure \ --localstatedir=/var/lib/locate \ $CONFIGURE_ARGS && make && make install } - -genpkg_rules() { - copy @std - DEPENDS="glibc-base slitaz-base-files" - TAGS="LFS" -}