[pkg-wine-party] [wine] 67/71: Use unversioned solinks in sonames2elf.

Jens Reyer jreyer-guest at moszumanska.debian.org
Mon Oct 23 21:52:08 UTC 2017


This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch buster
in repository wine.

commit 5f700af48d1130a268fccbfbc4869c996ca5a5f7
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Oct 12 23:15:27 2017 +0200

    Use unversioned solinks in sonames2elf.
    
    See: wine-development #827770
---
 debian/scripts/sonames2elf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/scripts/sonames2elf b/debian/scripts/sonames2elf
index 2e565b7..a69d8a5 100755
--- a/debian/scripts/sonames2elf
+++ b/debian/scripts/sonames2elf
@@ -1,8 +1,7 @@
 #!/bin/sh
-# encoding=UTF-8
+# Build an ELF depending on specified sonames.
 
-# Build an elf binary depending on sonames.
-# Than dpkg-shlibdeps can compute optional dependencies on dlopen'ed libraries.
+# dpkg-shlibdeps can compute dependencies on dlopen'ed libraries with this ELF.
 # Needed as workaround until this can be done directly with dpkg.  See
 # https://bugs.debian.org/596715 (dpkg-shlibdeps: Please allow to manually add
 # library dependencies via shlibdeps)
@@ -35,7 +34,10 @@ then
 fi
 tmpdir=$(mktemp -d -t sonames2elf.XXXXXX)
 cd "$tmpdir"
-printf 'INPUT(%s)\n' "$@" > libeverything.so
+# Use the unversioned solink because the soname might be not found.
+# solink always points to the default soname, which is what wine uses.
+SOLINKS="$(echo $@ | sed "s|\([[:alnum:]]*\.so\)[\.[0-9]*]*|\1|g")"
+printf 'INPUT(%s)\n' "$SOLINKS" > libeverything.so
 gcc -shared -Wl,--no-as-needed -L. -leverything -o elf
 cat elf
 rm -rf "$tmpdir"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git



More information about the pkg-wine-party mailing list