diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /ltmain.sh.patch | |
parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'ltmain.sh.patch')
-rw-r--r-- | ltmain.sh.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/ltmain.sh.patch b/ltmain.sh.patch new file mode 100644 index 0000000..de0a798 --- /dev/null +++ b/ltmain.sh.patch @@ -0,0 +1,44 @@ +Author: Henning Meirer-Geinitz + + Use "libsane" soname for every backend (all systems but AIX and mingw) + +diff --git a/ltmain.sh b/ltmain.sh +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -9615,6 +9615,23 @@ EOF + dlname=$soname + fi + ++ # If -module or -export-dynamic was specified, set the dlname ++ if test "$module" = yes || test "$export_dynamic" = yes; then ++ # On all known operating systems, these are identical. ++ dlname="$soname" ++ fi ++ ++ # On sane-backends the internal name for every lib is "libsane" ++ # not "libsane-backendname" so that linking to each backend is possible. ++ case $host in ++ *mingw*) ++ ;; ++ *aix*) ++ ;; ++ *) ++ soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"` ++ esac ++ + lib=$output_objdir/$realname + linknames= + for link +@@ -10073,12 +10090,6 @@ EOF + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done +- +- # If -module or -export-dynamic was specified, set the dlname. +- if test yes = "$module" || test yes = "$export_dynamic"; then +- # On all known operating systems, these are identical. +- dlname=$soname +- fi + fi + ;; + |