From 0857ff7f632e57090e5dcb764eb1837e34181fcf Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 30 Sep 2019 21:08:32 +0000 Subject: Mon Sep 30 21:08:32 UTC 2019 d/llvm-9.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Thanks to orbea for getting this working and cleaning up the build script. d/vala-0.46.2-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_67-x86_64-1.txz: Upgraded. Fixed --disable-opencl configure option. Thanks to Markus Wiesner for the bug report and to upstream for the quick fix. n/NetworkManager-1.20.4-x86_64-1.txz: Upgraded. n/gnutls-3.6.10-x86_64-1.txz: Upgraded. x/freeglut-3.2.1-x86_64-1.txz: Upgraded. x/libglvnd-1.1.1-x86_64-2.txz: Upgraded. Reverted to this version since I'm seeing some errors linking with Mesa libraries with the newer one. Thanks to nobodino for the bug report. x/mesa-19.2.0-x86_64-2.txz: Rebuilt. Recompiled against llvm-9.0.0 and libglvnd-1.1.1. x/xf86-video-vmware-13.3.0-x86_64-3.txz: Rebuilt. Recompiled against llvm-9.0.0. --- source/d/Cython/Cython.SlackBuild | 4 +- source/d/autoconf/autoconf.SlackBuild | 4 +- source/d/automake/automake.SlackBuild | 6 +- source/d/binutils/binutils.SlackBuild | 6 +- source/d/bison/bison.SlackBuild | 4 +- source/d/ccache/ccache.SlackBuild | 4 +- source/d/clisp/clisp.SlackBuild | 8 +-- source/d/cmake/cmake.SlackBuild | 4 +- source/d/cscope/cscope.SlackBuild | 4 +- source/d/cvs/cvs.SlackBuild | 4 +- source/d/dev86/dev86.SlackBuild | 10 +-- source/d/distcc/distcc.SlackBuild | 4 +- source/d/doxygen/doxygen.SlackBuild | 4 +- source/d/flex/flex.SlackBuild | 4 +- source/d/gcc/gcc.SlackBuild | 4 +- source/d/gdb/gdb.SlackBuild | 6 +- source/d/git/git.SlackBuild | 6 +- source/d/gnucobol/gnucobol.SlackBuild | 4 +- source/d/gperf/gperf.SlackBuild | 4 +- source/d/guile/guile.SlackBuild | 4 +- source/d/help2man/help2man.SlackBuild | 4 +- source/d/icecream/icecream.SlackBuild | 6 +- source/d/indent/indent.SlackBuild | 6 +- source/d/intltool/intltool.SlackBuild | 4 +- source/d/libtool/libtool.SlackBuild | 4 +- source/d/llvm/clang-tools-extra.no.clangd.diff | 20 ------ source/d/llvm/llvm.SlackBuild | 76 +++++++--------------- source/d/llvm/llvm.url | 28 +++----- .../llvm/n_clang_allow_BUILD_SHARED_LIBRARY.patch | 19 ------ source/d/m4/m4.SlackBuild | 4 +- source/d/make/make.SlackBuild | 4 +- source/d/mercurial/mercurial.SlackBuild | 4 +- source/d/meson/meson.SlackBuild | 8 +-- source/d/nasm/nasm.SlackBuild | 4 +- source/d/ninja/ninja.SlackBuild | 6 +- source/d/opencl-headers/opencl-headers.SlackBuild | 4 +- source/d/oprofile/oprofile.SlackBuild | 4 +- source/d/p2c/p2c.SlackBuild | 4 +- source/d/parallel/parallel.SlackBuild | 6 +- source/d/patchelf/patchelf.SlackBuild | 6 +- source/d/perl/perl.SlackBuild | 4 +- source/d/pkg-config/pkg-config.SlackBuild | 4 +- source/d/pmake/pmake.SlackBuild | 4 +- source/d/python-pip/python-pip.SlackBuild | 6 +- .../python-setuptools/python-setuptools.SlackBuild | 6 +- source/d/python/python.SlackBuild | 12 ++-- source/d/python3/python3.SlackBuild | 16 ++--- source/d/rcs/rcs.SlackBuild | 4 +- source/d/re2c/re2c.SlackBuild | 4 +- source/d/ruby/ruby.SlackBuild | 4 +- source/d/rust/rust.SlackBuild | 8 +-- source/d/scons/scons.SlackBuild | 6 +- source/d/strace/strace.SlackBuild | 4 +- source/d/subversion/subversion.SlackBuild | 14 ++-- source/d/swig/swig.SlackBuild | 8 +-- source/d/vala/vala.SlackBuild | 6 +- source/d/yasm/yasm.SlackBuild | 4 +- 57 files changed, 177 insertions(+), 256 deletions(-) delete mode 100644 source/d/llvm/clang-tools-extra.no.clangd.diff delete mode 100644 source/d/llvm/n_clang_allow_BUILD_SHARED_LIBRARY.patch (limited to 'source/d') diff --git a/source/d/Cython/Cython.SlackBuild b/source/d/Cython/Cython.SlackBuild index c3924c692..326cc7525 100755 --- a/source/d/Cython/Cython.SlackBuild +++ b/source/d/Cython/Cython.SlackBuild @@ -57,9 +57,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ python3 setup.py install --root=$PKG --prefix=/usr || exit 1 diff --git a/source/d/autoconf/autoconf.SlackBuild b/source/d/autoconf/autoconf.SlackBuild index 6ff823842..b006e5907 100755 --- a/source/d/autoconf/autoconf.SlackBuild +++ b/source/d/autoconf/autoconf.SlackBuild @@ -61,9 +61,9 @@ cd autoconf-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ ./configure \ --prefix=/usr \ diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild index fc2c46986..789b68447 100755 --- a/source/d/automake/automake.SlackBuild +++ b/source/d/automake/automake.SlackBuild @@ -59,9 +59,9 @@ cd automake-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ ./configure \ --prefix=/usr \ @@ -90,7 +90,7 @@ mkdir -p $PKG/usr/share/aclocal touch $PKG/usr/share/aclocal # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index 4d662efe2..d50e5cb07 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -113,9 +113,9 @@ sed -i -e 's/%''{release}/slack15/g' bfd/Makefile{.am,.in} chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # End of preparations if echo "$*" | grep -qw -- --prep ; then @@ -206,7 +206,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ # Remove some unneeded man pages, and then compress the rest rm -f $PKG/usr/man/man1/{dlltool,windres}.1 ( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; + find . -type f -exec gzip -9 {} \+ for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild index f83de5306..ce8751533 100755 --- a/source/d/bison/bison.SlackBuild +++ b/source/d/bison/bison.SlackBuild @@ -73,9 +73,9 @@ cd bison-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Don't use icecream: PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild index 0b4b235fd..905a20469 100755 --- a/source/d/ccache/ccache.SlackBuild +++ b/source/d/ccache/ccache.SlackBuild @@ -59,9 +59,9 @@ cd ccache-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ ./configure \ --prefix=/usr \ diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild index b91e326c8..8462f1c74 100755 --- a/source/d/clisp/clisp.SlackBuild +++ b/source/d/clisp/clisp.SlackBuild @@ -82,9 +82,9 @@ cd libffcall-$FFCALLVER || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -119,9 +119,9 @@ cd clisp-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Fix build failure with missing struct member: zcat $CWD/clisp.c_data.compact_empty_buckets.diff.gz | patch -p1 --verbose || exit diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild index 10c161287..7b8c62ab9 100755 --- a/source/d/cmake/cmake.SlackBuild +++ b/source/d/cmake/cmake.SlackBuild @@ -70,9 +70,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir cmake-build cd cmake-build diff --git a/source/d/cscope/cscope.SlackBuild b/source/d/cscope/cscope.SlackBuild index 1f4ea40fb..3f52947b4 100755 --- a/source/d/cscope/cscope.SlackBuild +++ b/source/d/cscope/cscope.SlackBuild @@ -79,9 +79,9 @@ cd ${PKGNAM}-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/cvs/cvs.SlackBuild b/source/d/cvs/cvs.SlackBuild index a378844f1..491ff48aa 100755 --- a/source/d/cvs/cvs.SlackBuild +++ b/source/d/cvs/cvs.SlackBuild @@ -74,9 +74,9 @@ zcat $CWD/cvs.getline64.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/dev86/dev86.SlackBuild b/source/d/dev86/dev86.SlackBuild index 1c10de807..fb49e7e94 100755 --- a/source/d/dev86/dev86.SlackBuild +++ b/source/d/dev86/dev86.SlackBuild @@ -73,9 +73,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ #Does not compile with changed CFLAGS #CC="gcc" make CFLAGS="-Wall -Wstrict-prototypes $SLKCFLAGS -g" DIST=$PKG || exit 1 @@ -89,7 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; + find . -type f -exec gzip -9 {} \+ for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) @@ -98,11 +98,11 @@ cp -a Changes Contributors COPYING README $PKG/usr/doc/$PKGNAM-$VERSION for i in bootblocks copt dis88 elksemu unproto ; do cp -a $i/README $PKG/usr/doc/$PKGNAM-$VERSION/README.$i ; done -find $PKG/usr/doc -type f -exec chmod 0644 {} \; +find $PKG/usr/doc -type f -exec chmod 0644 {} \+ if [ "$ARCH" = "x86_64" ]; then # Remove traces of elks rm -f $PKG/usr/doc/$PKGNAM-$VERSION/README.elksemu - find $PKG/usr/man -name "elks*.*" -exec rm -f {} \; + find $PKG/usr/man -name "elks*.*" -exec rm -f {} \+ fi mkdir -p $PKG/install diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild index 0b881cd3c..d77e61e46 100755 --- a/source/d/distcc/distcc.SlackBuild +++ b/source/d/distcc/distcc.SlackBuild @@ -73,9 +73,9 @@ cd distcc-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Make sure we change code/docs to use lib64 if needed: if [ ! "$LIBDIRSUFFIX" = "" ]; then diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild index d01b89050..5ee6003bb 100755 --- a/source/d/doxygen/doxygen.SlackBuild +++ b/source/d/doxygen/doxygen.SlackBuild @@ -72,9 +72,9 @@ cd doxygen-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir build cd build diff --git a/source/d/flex/flex.SlackBuild b/source/d/flex/flex.SlackBuild index 20bcdc448..17f53d979 100755 --- a/source/d/flex/flex.SlackBuild +++ b/source/d/flex/flex.SlackBuild @@ -75,9 +75,9 @@ cd ${PKGNAM}-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Fix an issue introduced with recent glibc versions. Thanks to LFS: sed -i "/math.h/a #include " src/flexdef.h diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index a53cdd7de..2c10fdcdc 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -172,9 +172,9 @@ zcat $CWD/patches/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --su chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 754 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 664 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Install docs: mkdir -p $PKG1/usr/doc/gcc-$VERSION diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index 025c2d3e3..1912b62df 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -68,9 +68,9 @@ cd gdb-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Currently broken in this version, but keep trying: if [ "$VERSION" = "8.3.1" ]; then @@ -105,7 +105,7 @@ cp -a COPYING* README $PKG/usr/doc/gdb-$VERSION cd gdb cp -a NEWS README $PKG/usr/doc/gdb-$VERSION/gdb cp -a gdbserver/README $PKG/usr/doc/gdb-$VERSION/README.gdbserver -find $PKG/usr/doc/gdb-$VERSION -type f -exec chmod 644 {} \; +find $PKG/usr/doc/gdb-$VERSION -type f -exec chmod 644 {} \+ # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ diff --git a/source/d/git/git.SlackBuild b/source/d/git/git.SlackBuild index 37c2a1087..e0a481c1b 100755 --- a/source/d/git/git.SlackBuild +++ b/source/d/git/git.SlackBuild @@ -82,9 +82,9 @@ cd git-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/doc/git-$VERSION cp -a \ @@ -93,7 +93,7 @@ cp -a \ contrib \ $PKG/usr/doc/git-$VERSION ( cd $PKG/usr/doc/git-$VERSION/Documentation ; rm *.1 *.3 *.7 ) -( cd $PKG/usr/doc/git-$VERSION && find . -name ".git*" -exec rm -r "{}" \; ) +( cd $PKG/usr/doc/git-$VERSION && find . -name ".git*" -exec rm -r "{}" \+ ) make $NUMJOBS \ prefix=/usr \ diff --git a/source/d/gnucobol/gnucobol.SlackBuild b/source/d/gnucobol/gnucobol.SlackBuild index 49ee3d908..e89e50374 100755 --- a/source/d/gnucobol/gnucobol.SlackBuild +++ b/source/d/gnucobol/gnucobol.SlackBuild @@ -81,9 +81,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure: CFLAGS="$SLKCFLAGS" \ diff --git a/source/d/gperf/gperf.SlackBuild b/source/d/gperf/gperf.SlackBuild index 3734908c5..b81e934ed 100755 --- a/source/d/gperf/gperf.SlackBuild +++ b/source/d/gperf/gperf.SlackBuild @@ -70,9 +70,9 @@ cd ${PKGNAM}-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure: CFLAGS="$SLKCFLAGS" \ diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild index 6483d9e60..56767bf69 100755 --- a/source/d/guile/guile.SlackBuild +++ b/source/d/guile/guile.SlackBuild @@ -76,9 +76,9 @@ cd guile-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/help2man/help2man.SlackBuild b/source/d/help2man/help2man.SlackBuild index 7dccd87c0..d58e2217d 100755 --- a/source/d/help2man/help2man.SlackBuild +++ b/source/d/help2man/help2man.SlackBuild @@ -87,9 +87,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure: CFLAGS="$SLKCFLAGS" \ diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild index 4819fc77b..922984f83 100755 --- a/source/d/icecream/icecream.SlackBuild +++ b/source/d/icecream/icecream.SlackBuild @@ -74,9 +74,9 @@ cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ #./autogen.sh || exit 1 @@ -123,7 +123,7 @@ done mkdir -p $PKG/var/{cache,log}/icecream chown icecc:icecc $PKG/var/{cache,log}/icecream -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/source/d/indent/indent.SlackBuild b/source/d/indent/indent.SlackBuild index ff09dbb91..4947d47b0 100755 --- a/source/d/indent/indent.SlackBuild +++ b/source/d/indent/indent.SlackBuild @@ -70,9 +70,9 @@ cd indent-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # GCC4 fix #sed -i -e 's#extern FILE \*output#static FILE *output#' src/indent.h || exit 1 @@ -104,7 +104,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ # Compress man pages: ( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; + find . -type f -exec gzip -9 {} \+ for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i done diff --git a/source/d/intltool/intltool.SlackBuild b/source/d/intltool/intltool.SlackBuild index 6b46828c7..919ab5c06 100755 --- a/source/d/intltool/intltool.SlackBuild +++ b/source/d/intltool/intltool.SlackBuild @@ -70,9 +70,9 @@ cd ${PKGNAM}-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Compatability with perl 5.22: zcat $CWD/intltool-0.51.0-perl-5.22.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index 15fd3fbc9..b928dc61d 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -74,9 +74,9 @@ cd libtool-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ zcat $CWD/libtool.no.moved.warning.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/d/llvm/clang-tools-extra.no.clangd.diff b/source/d/llvm/clang-tools-extra.no.clangd.diff deleted file mode 100644 index cae833069..000000000 --- a/source/d/llvm/clang-tools-extra.no.clangd.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./tools/clang/tools/extra/CMakeLists.txt.orig 2018-03-22 18:34:46.000000000 -0500 -+++ ./tools/clang/tools/extra/CMakeLists.txt 2018-09-20 18:03:37.034041551 -0500 -@@ -10,17 +10,10 @@ - add_subdirectory(clang-doc) - add_subdirectory(clang-query) - add_subdirectory(clang-move) --add_subdirectory(clangd) - add_subdirectory(include-fixer) - add_subdirectory(pp-trace) - add_subdirectory(tool-template) - --# Add the common testsuite after all the tools. --if(CLANG_INCLUDE_TESTS) --add_subdirectory(test) --add_subdirectory(unittests) --endif() -- - option(CLANG_TOOLS_EXTRA_INCLUDE_DOCS "Generate build targets for the Clang Extra Tools docs." - ${LLVM_INCLUDE_DOCS}) - if( CLANG_TOOLS_EXTRA_INCLUDE_DOCS ) diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild index f0626ffa7..a8682e354 100755 --- a/source/d/llvm/llvm.SlackBuild +++ b/source/d/llvm/llvm.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for llvm # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012, 2013, 2014, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2012, 2013, 2014, 2015, 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,6 +69,13 @@ PY2=$(python -c 'from distutils.sysconfig import get_python_lib; print(get_pytho # Python3 short version: PY3=$(python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' | cut -f 2 -d n | cut -f 1 -d /) +# Sadly, glibc-2.30 exposed some sort of problem with clang and icecream. +# The symptom is a compile failure that says none of the types in +# are defined, even though they are. gcc/g++ seem unaffected. +# For now, not much choice other than to disable this. +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -114,26 +121,21 @@ zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p1 --verbose || exit 1 # clangd to avoid the failure. Any help with a proper fix is appreciated. # I have not reported this upstream since I suspect that it's an artifact # of our convoluted build method. -if [ $ARCH = i586 ] || [ $ARCH = i686 ]; then - zcat $CWD/clang-tools-extra.no.clangd.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -fi +case $ARCH in + i?86) CLANGD="-DCLANG_ENABLE_CLANGD=OFF" ;; + *) unset CLANGD ;; +esac chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ -# Work around https://llvm.org/bugs/show_bug.cgi?id=30587 -# by building clang with shared libs -zcat $CWD/n_clang_allow_BUILD_SHARED_LIBRARY.patch.gz | patch -p0 --verbose || exit 1 - -# need to disable assertions to make llvm thread-safe -# clang resource dir is a relative path based on the location of the clang binary mkdir build cd build - cmake \ + cmake -GNinja \ -DCMAKE_C_COMPILER="clang" \ -DCMAKE_CXX_COMPILER="clang++" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -141,52 +143,20 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=OFF \ - -DCLANG_BUILD_SHARED_LIBS=ON \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_LINK_LLVM_DYLIB=ON \ + -DBUILD_SHARED_LIBS=ON \ -DLLVM_USE_LINKER=gold \ -DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_FFI=ON \ -DLLVM_ENABLE_ASSERTIONS=OFF \ - -DLLVM_USE_OPROFILE=ON \ -DLLVM_INSTALL_UTILS=ON \ -DLLVM_BINUTILS_INCDIR=/usr/include \ -DCLANG_RESOURCE_DIR="../lib${LIBDIRSUFFIX}/clang/${VERSION}" \ - .. || exit 1 - - # Breaks with one of the patches above. Maybe revisit later? - # -DBUILD_SHARED_LIBS=ON \ - - # This seems to not like a parallel build, at least as of 7.0.0. I don't have - # days to wait for the compile though, so let's just smack it with a hammer - # fifty times before dropping back to a single-threaded build: - for index in $(seq 1 50) ; do - #make $NUMJOBS VERBOSE=1 - make $NUMJOBS - ERR_RESULT=$? - if [ $ERR_RESULT = 0 ]; then - break - fi - echo "*** PARALLEL MAKE RESTART NUMBER $index" - done - if [ ! $ERR_RESULT = 0 ]; then - # Fifty more for the single thread: - for index in $(seq 1 50) ; do - #make VERBOSE=1 - make - ERR_RESULT=$? - if [ $ERR_RESULT = 0 ]; then - break - fi - echo "*** NON-PARALLEL MAKE RESTART NUMBER $index" - done - fi - if [ ! $ERR_RESULT = 0 ]; then - exit 1 - fi - - make install DESTDIR=$PKG || exit 1 + -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \ + $CLANGD \ + .. || exit 1 + + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG "$NINJA" install || exit 1 cd .. # Add symlinks for $ARCH-slackware-linux-{clang,clang++}: @@ -237,7 +207,7 @@ mv $PKG/usr/share/man $PKG/usr/ ) # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url index 7a7a7e007..0f5b2ca23 100644 --- a/source/d/llvm/llvm.url +++ b/source/d/llvm/llvm.url @@ -1,19 +1,9 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/clang-tools-extra-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/compiler-rt-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lldb-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/openmp-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxxabi-8.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lld-8.0.1.src.tar.xz -# Or, use the archives from the main site: -#http://llvm.org/releases/8.0.1/llvm-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/cfe-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/clang-tools-extra-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/compiler-rt-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/lldb-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/openmp-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/libcxx-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/libcxxabi-8.0.1.src.tar.xz -#http://llvm.org/releases/8.0.1/lld-8.0.1.src.tar.xz +http://llvm.org/releases/9.0.0/llvm-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/cfe-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/clang-tools-extra-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/compiler-rt-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/lldb-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/openmp-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/libcxx-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/libcxxabi-9.0.0.src.tar.xz +http://llvm.org/releases/9.0.0/lld-9.0.0.src.tar.xz diff --git a/source/d/llvm/n_clang_allow_BUILD_SHARED_LIBRARY.patch b/source/d/llvm/n_clang_allow_BUILD_SHARED_LIBRARY.patch deleted file mode 100644 index 8e42aaee6..000000000 --- a/source/d/llvm/n_clang_allow_BUILD_SHARED_LIBRARY.patch +++ /dev/null @@ -1,19 +0,0 @@ -We use LLVM_BUILD_LLVM_DYLIB to build the llvm libraries as shared, but that -does not work for clang. We can use BUILD_SHARED_LIBS on clang, but since we -build them all together, we need to smuggle it in using this patch. - -Index: CMakeLists.txt -=================================================================== ---- tools/clang/CMakeLists.txt -+++ tools/clang/CMakeLists.txt -@@ -1,5 +1,10 @@ - cmake_minimum_required(VERSION 3.4.3) - -+if( CLANG_BUILD_SHARED_LIBS ) -+ set(BUILD_SHARED_LIBS ON) -+ set(LLVM_BUILD_LLVM_DYLIB OFF) -+endif() -+ - # If we are not building as a part of LLVM, build Clang as an - # standalone project, using LLVM as an external library: - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild index 886cbc1ec..8228fedbc 100755 --- a/source/d/m4/m4.SlackBuild +++ b/source/d/m4/m4.SlackBuild @@ -79,9 +79,9 @@ zcat $CWD/m4.glibc228.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild index 1bd4eee1a..7536d8daa 100755 --- a/source/d/make/make.SlackBuild +++ b/source/d/make/make.SlackBuild @@ -73,9 +73,9 @@ cd make-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ zcat $CWD/make.guile22.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/make.glibc-2.27.glob.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/d/mercurial/mercurial.SlackBuild b/source/d/mercurial/mercurial.SlackBuild index b825c2dd9..dff5f3cb9 100755 --- a/source/d/mercurial/mercurial.SlackBuild +++ b/source/d/mercurial/mercurial.SlackBuild @@ -58,9 +58,9 @@ cd mercurial-$VERSION || exit 1 chown -R root.root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ python setup.py build install --root=$PKG || exit 1 diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild index 860dd31f1..42c5da47c 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -56,9 +56,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # Fix meson configure crash: zcat $CWD/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch.gz | patch -p1 --verbose || exit 1 @@ -68,13 +68,13 @@ python3 setup.py install --root=$PKG || exit 1 mv $PKG/usr/share/man $PKG/usr/ rmdir $PKG/usr/share 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a contributing.txt COPYING PKG-INFO README* \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \; +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild index 1e19f070f..7767aea4a 100755 --- a/source/d/nasm/nasm.SlackBuild +++ b/source/d/nasm/nasm.SlackBuild @@ -65,9 +65,9 @@ cd nasm-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/ninja/ninja.SlackBuild b/source/d/ninja/ninja.SlackBuild index 242116f3f..f0b6c6af1 100755 --- a/source/d/ninja/ninja.SlackBuild +++ b/source/d/ninja/ninja.SlackBuild @@ -85,9 +85,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Build the program: LDFLAGS="$SLKLDFLAGS" \ @@ -108,7 +108,7 @@ install -D -m0644 misc/ninja-mode.el $PKG/usr/share/emacs/site-lisp/ninja-mode.e # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/d/opencl-headers/opencl-headers.SlackBuild b/source/d/opencl-headers/opencl-headers.SlackBuild index 130d860bd..c795910a3 100755 --- a/source/d/opencl-headers/opencl-headers.SlackBuild +++ b/source/d/opencl-headers/opencl-headers.SlackBuild @@ -60,9 +60,9 @@ zcat $CWD/opencl.no.pragma.for.default.version.diff.gz | patch -p1 --verbose || chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/include/CL diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index 69fe906d1..67ea7e5aa 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -78,9 +78,9 @@ cd oprofile-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/d/p2c/p2c.SlackBuild b/source/d/p2c/p2c.SlackBuild index 79bf1d615..da181544b 100755 --- a/source/d/p2c/p2c.SlackBuild +++ b/source/d/p2c/p2c.SlackBuild @@ -74,9 +74,9 @@ cd p2c-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ find . -name "*.orig" | xargs rm --verbose diff --git a/source/d/parallel/parallel.SlackBuild b/source/d/parallel/parallel.SlackBuild index 806c57545..7bb6863eb 100755 --- a/source/d/parallel/parallel.SlackBuild +++ b/source/d/parallel/parallel.SlackBuild @@ -84,9 +84,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure, build, and install: CFLAGS="$SLKCFLAGS" \ @@ -114,7 +114,7 @@ sed -i "s|#\!/usr/bin/env bash|#\!/bin/bash|g" $PKG/usr/bin/* find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/d/patchelf/patchelf.SlackBuild b/source/d/patchelf/patchelf.SlackBuild index 7b8784fef..e4099e017 100755 --- a/source/d/patchelf/patchelf.SlackBuild +++ b/source/d/patchelf/patchelf.SlackBuild @@ -81,9 +81,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Use /usr/include/elf.h from glibc, which is a newer version: rm -f src/elf.h @@ -115,7 +115,7 @@ cp -a \ $PKG/usr/doc/${PKGNAM}-$VERSION # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild index 48ec138fe..c0fb8bd58 100755 --- a/source/d/perl/perl.SlackBuild +++ b/source/d/perl/perl.SlackBuild @@ -125,9 +125,9 @@ cd perl-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # If after all this time you still don't trust threads, comment # out the variable below: diff --git a/source/d/pkg-config/pkg-config.SlackBuild b/source/d/pkg-config/pkg-config.SlackBuild index 34de2509f..e654fa04d 100755 --- a/source/d/pkg-config/pkg-config.SlackBuild +++ b/source/d/pkg-config/pkg-config.SlackBuild @@ -78,9 +78,9 @@ cd pkg-config-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/pmake/pmake.SlackBuild b/source/d/pmake/pmake.SlackBuild index 5cbd437bb..b41e2d709 100755 --- a/source/d/pmake/pmake.SlackBuild +++ b/source/d/pmake/pmake.SlackBuild @@ -80,9 +80,9 @@ fi chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" make -f Makefile.boot || exit 1 diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild index 8fb4432e7..c4171e8b2 100755 --- a/source/d/python-pip/python-pip.SlackBuild +++ b/source/d/python-pip/python-pip.SlackBuild @@ -57,9 +57,9 @@ cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ python3 setup.py install --root=$PKG || exit 1 @@ -72,7 +72,7 @@ python setup.py install --root=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a *.txt PKG-INFO README.rst \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \; +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ # If there's a CHANGES.txt, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index b178de8c0..c44ac34f5 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -67,9 +67,9 @@ cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ rm -f setuptools/*.exe @@ -84,7 +84,7 @@ python setup.py install --root=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \; +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ # If there's a CHANGES.rst, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild index d1d37a6db..4a51a71ee 100755 --- a/source/d/python/python.SlackBuild +++ b/source/d/python/python.SlackBuild @@ -90,9 +90,9 @@ fi chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Enable built-in SQLite module to load extensions sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py @@ -146,9 +146,9 @@ chown -R root:root $PKG/usr/doc/python-$VERSION # Fix possible incorrect permissions: ( cd $PKG - find . -type d -exec chmod 755 "{}" \; - find . -perm 640 -exec chmod 644 "{}" \; - find . -perm 750 -exec chmod 755 "{}" \; + find . -type d -exec chmod 755 "{}" \+ + find . -perm 640 -exec chmod 644 "{}" \+ + find . -perm 750 -exec chmod 755 "{}" \+ ) @@ -165,7 +165,7 @@ chown -R root:root $PKG/usr/doc/python-$VERSION ) ( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; + find . -type f -exec gzip -9 {} \+ for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild index 40e75e843..82836b7ee 100755 --- a/source/d/python3/python3.SlackBuild +++ b/source/d/python3/python3.SlackBuild @@ -99,9 +99,9 @@ sed -i 's|\("install",\)|\1 "--ignore-installed",|' Lib/ensurepip/__init__.py chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ ./configure \ --prefix=/usr \ @@ -127,10 +127,10 @@ mkdir -p $SITEPK cp -a Tools/* $SITEPK # Remove DOS batch/exe files. -find $PKG \( -name '*.exe' -o -name '*.bat' \) -exec rm -f '{}' \; +find $PKG \( -name '*.exe' -o -name '*.bat' \) -exec rm -f '{}' \+ # Fix permissions on dynamic libraries. -find $PKG -type f -perm 555 -exec chmod 755 '{}' \; +find $PKG -type f -perm 555 -exec chmod 755 '{}' \+ # Install docs. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION @@ -147,15 +147,15 @@ fi # Fix possible incorrect permissions. ( cd $PKG - find . -type d -exec chmod 755 "{}" \; - find . -perm 640 -exec chmod 644 "{}" \; - find . -perm 750 -exec chmod 755 "{}" \; + find . -type d -exec chmod 755 "{}" \+ + find . -perm 640 -exec chmod 644 "{}" \+ + find . -perm 750 -exec chmod 755 "{}" \+ ) find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/install diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild index e89d96740..a726daf49 100755 --- a/source/d/rcs/rcs.SlackBuild +++ b/source/d/rcs/rcs.SlackBuild @@ -90,9 +90,9 @@ cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure: CFLAGS="$SLKCFLAGS -std=c99" \ diff --git a/source/d/re2c/re2c.SlackBuild b/source/d/re2c/re2c.SlackBuild index e2c263ea9..56cf490c8 100755 --- a/source/d/re2c/re2c.SlackBuild +++ b/source/d/re2c/re2c.SlackBuild @@ -81,9 +81,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild index 807b98df7..3ff798784 100755 --- a/source/d/ruby/ruby.SlackBuild +++ b/source/d/ruby/ruby.SlackBuild @@ -86,9 +86,9 @@ cd ruby-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Evidently certain things must be linked static. # Seems suboptimal to me... diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 56aa96562..41110a3d4 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -213,9 +213,9 @@ fi chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ export PKG_CONFIG_ALLOW_CROSS=1 @@ -263,7 +263,7 @@ sed -i "s,/tmp/package-rust/,/,g" $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log gzip -9 $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* # Correct permissions on shared libraries: -find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \; +find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ # Evidently there are a lot of duplicated libraries in this tree, so let's # try to save some space: @@ -280,7 +280,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr done # Compress man pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Add some documentation: diff --git a/source/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild index 88bd1ebb3..41daaca52 100755 --- a/source/d/scons/scons.SlackBuild +++ b/source/d/scons/scons.SlackBuild @@ -72,9 +72,9 @@ cd scons-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ python setup.py install \ --no-version-script \ @@ -85,7 +85,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; + find . -type f -exec gzip -9 {} \+ for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) diff --git a/source/d/strace/strace.SlackBuild b/source/d/strace/strace.SlackBuild index d3d86368c..f0e7369f9 100755 --- a/source/d/strace/strace.SlackBuild +++ b/source/d/strace/strace.SlackBuild @@ -69,9 +69,9 @@ cd strace-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ if [ ! -x configure ]; then ./bootstrap diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 6ea1cb92b..5d0bb6535 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -74,9 +74,9 @@ cd subversion-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ if [ "$VERSION" = "1.12.0" ]; then # Workaround for building with apr-1.7.0: @@ -163,14 +163,14 @@ rm -rf $PKG/usr/doc/subversion-$VERSION/doc/tools mv svn-book-html book cd book chown -R root:root . - find . -type d -exec chmod 0755 {} \; - find . -type f -exec chmod 0644 {} \; - find . -perm 2755 -exec chmod 0755 {} \; + find . -type d -exec chmod 0755 {} \+ + find . -type f -exec chmod 0644 {} \+ + find . -perm 2755 -exec chmod 0755 {} \+ find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ ) # If there's a CHANGES file, installing at least part of the recent history diff --git a/source/d/swig/swig.SlackBuild b/source/d/swig/swig.SlackBuild index 2afe26d31..b45adb6e7 100755 --- a/source/d/swig/swig.SlackBuild +++ b/source/d/swig/swig.SlackBuild @@ -69,9 +69,9 @@ cd swig-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -114,8 +114,8 @@ cp -a \ Examples Doc/Manual Doc/Devel \ $PKG/usr/doc/swig-$VERSION # Fix permissions and wipe the pdf bloat -find $PKG/usr/doc/swig-$VERSION -type f -exec chmod 0644 {} \; -find $PKG/usr/doc/swig-$VERSION -name "*.pdf" -exec rm -f {} \; +find $PKG/usr/doc/swig-$VERSION -type f -exec chmod 0644 {} \+ +find $PKG/usr/doc/swig-$VERSION -name "*.pdf" -exec rm -f {} \+ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/vala/vala.SlackBuild b/source/d/vala/vala.SlackBuild index 86c8ec5ff..9d95a2155 100755 --- a/source/d/vala/vala.SlackBuild +++ b/source/d/vala/vala.SlackBuild @@ -81,9 +81,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Don't use graphviz if it's not on the system. if ! /bin/ls /usr/man/man7/graphviz.7.gz 1> /dev/null 2> /dev/null ; then @@ -127,7 +127,7 @@ rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la ) # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild index ae976f889..8fde7a0ad 100755 --- a/source/d/yasm/yasm.SlackBuild +++ b/source/d/yasm/yasm.SlackBuild @@ -158,14 +158,14 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION || true rm $PKG/usr/doc/$PKGNAM-$VERSION/CMakeLists.txt chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Remove empty share directory: rmdir $PKG/usr/share || true # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi -- cgit v1.2.3