diff options
Diffstat (limited to 'source/a/aaa_libraries')
4 files changed, 22 insertions, 10 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index c778a5034..6e879a317 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.0} -BUILD=${BUILD:-10} +BUILD=${BUILD:-11} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -64,7 +64,10 @@ cat $CWD/symlinks-to-tracked-libs \ | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \ -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \ | while read library ; do - ( [ ! -e $library ] && exit 0 + ( if [ ! -e $library ]; then + echo "WARNING: $library not found" + sleep 10 + fi echo "Adding $library" mkdir -p $(dirname $library | cut -b2- ) cd $(dirname $library | cut -b2- ) @@ -80,7 +83,10 @@ cat $CWD/tracked-files \ | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \ -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \ | while read library ; do - ( [ ! -e $library ] && exit 0 + ( if [ ! -e $library ]; then + echo "WARNING: $library not found" + sleep 10 + fi echo "Adding $library" mkdir -p $(dirname $library | cut -b2- ) cd $(dirname $library | cut -b2- ) @@ -94,7 +100,10 @@ cat $CWD/symlinks-to-tracked-libs-tmp.d/* \ | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \ -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \ | while read library ; do - ( [ ! -e $library ] && exit 0 + ( if [ ! -e $library ]; then + echo "WARNING: $library not found" + sleep 10 + fi echo "Adding $library" mkdir -p $(dirname $library | cut -b2- ) cd $(dirname $library | cut -b2- ) @@ -110,7 +119,10 @@ cat $CWD/tracked-files-tmp.d/* \ | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \ -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \ | while read library ; do - ( [ ! -e $library ] && exit 0 + ( if [ ! -e $library ]; then + echo "WARNING: $library not found" + sleep 10 + fi echo "Adding $library" mkdir -p $(dirname $library | cut -b2- ) cd $(dirname $library | cut -b2- ) diff --git a/source/a/aaa_libraries/display_orphans.sh b/source/a/aaa_libraries/display_orphans.sh index 32bd570bd..56b7b1b98 100755 --- a/source/a/aaa_libraries/display_orphans.sh +++ b/source/a/aaa_libraries/display_orphans.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2015, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Show libraries that are only present in the aaa_elflibs that is currently +# Show libraries that are only present in the aaa_libraries that is currently # installed on the system. cleanup() { @@ -33,8 +33,8 @@ trap 'cleanup' 2 14 15 # trap CTRL+C and kill TMPDIR="$(mktemp -d /tmp/find-aaaelfliborphans.XXXXXX)" cp -a /var/log/packages/* $TMPDIR -rm -f $TMPDIR/aaa_elflibs-* -cat /var/log/packages/aaa_elflibs-* | grep -v -e PACKAGE -e aaa_elflibs: -e FILE -e '^\./$' -e install/ | grep -v '/$' | while read file ; do +rm -f $TMPDIR/aaa_libraries-* +cat /var/log/packages/aaa_libraries-* | grep -v -e PACKAGE -e aaa_libraries: -e FILE -e '^\./$' -e install/ | grep -v '/$' | while read file ; do if ! grep -q $file $TMPDIR/* ; then echo $file fi diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs b/source/a/aaa_libraries/symlinks-to-tracked-libs index 4c946be56..58272c5f8 100644 --- a/source/a/aaa_libraries/symlinks-to-tracked-libs +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs @@ -73,7 +73,6 @@ /usr/lib/libpanelw.so.5 /usr/lib/libpanelw.so.6 /usr/lib/libpcre2-8.so.0 -/usr/lib/libpng.so.14 /usr/lib/libpng14.so.14 /usr/lib/libpng16.so.16 /usr/lib/libpsl.so.5 diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libvpx b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libvpx new file mode 100644 index 000000000..bb3f65ca9 --- /dev/null +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libvpx @@ -0,0 +1 @@ +/usr/lib/libvpx.so.6 |