libpthread-stubs: fix and extend UP_TRIGGERS for version 0.4

This now triggers at all for the version 0.4 update and employs
some additional work to find stuff that has libpthread-stubs only
in the installed .la files.

3 files changed, 15 insertions, 43 deletions

diff --git a/xorg-extras/libpthread-stubs/HISTORY b/xorg-extras/libpthread-stubs/HISTORY
index 12424c8d04..5afa4dd3cd 100644
--- a/xorg-extras/libpthread-stubs/HISTORY
+++ b/xorg-extras/libpthread-stubs/HISTORY
@@ -1,3 +1,7 @@
+2018-01-07 Thomas Orgis <sobukus@sourcemage.org>
+	* UP_TRIGGERS: updated to for version 0.4 and also to catch libtool
+	  junk dependencies
+
 2017-03-15 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.4
 
diff --git a/xorg-extras/libpthread-stubs/UP_TRIGGERS b/xorg-extras/libpthread-stubs/UP_TRIGGERS
index 74d4163a97..687a4b2a99 100755
--- a/xorg-extras/libpthread-stubs/UP_TRIGGERS
+++ b/xorg-extras/libpthread-stubs/UP_TRIGGERS
@@ -1,12 +1,20 @@
+. "$GRIMOIRE"/FUNCTIONS
+# Not using the normal depender check as there is indirect use
+# of the fake lib that enters libtool files.
 if spell_ok $SPELL; then
   local OLD_SPELL_VERSION="$(installed_version $SPELL)"
-  if [[ "${VERSION}" != "${OLD_SPELL_VERSION}" ]] &&
-     [[ "${OLD_SPELL_VERSION}" < 0.3 ]]; then
+  if is_version_less $OLD_SPELL_VERSION 0.4; then
     message "This is an ABI incompatible update of libpthread-stubs..."
     message "Determining which spells need to be recast, this may take a while."
 
+    # There are spells wich do not link to the .so, but still have the .la
+    # in dependencies in their .la file (giflib), inherited. So first check for
+    # that and also for actual linkage.
     for other_spell in $(gaze installed | cut -d: -f1); do
       if gaze install $other_spell \
+	 | grep '\.la$' \
+	 | xargs grep -q 'libpthread-stubs' ||
+	 gaze install $other_spell \
          | xargs file -e apptype -e ascii -e compress -e tar \
          | grep '\<ELF\>.*\<dynamically linked\>' \
          | cut -d: -f1 \
@@ -17,3 +25,4 @@ if spell_ok $SPELL; then
     done
   fi
 fi
+
diff --git a/xorg-extras/libpthread-stubs/libpthread-stubs.la b/xorg-extras/libpthread-stubs/libpthread-stubs.la
deleted file mode 100755
index 7d5d063cf7..0000000000
--- a/xorg-extras/libpthread-stubs/libpthread-stubs.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libpthread-stubs.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names='libc.so'
-
-# The name of the static archive.
-old_library=''
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libpthread-stubs.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'