summaryrefslogtreecommitdiff
path: root/debian/patches/multiarch_dll_search_path.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-10-14 10:37:33 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-10-14 10:37:33 +0200
commit0cdca259ca073f77b9ae831feb367b6d120e83cf (patch)
tree50862cd94a3ee737ed614fd793821ba29c969ee7 /debian/patches/multiarch_dll_search_path.patch
parent82a152928f820a6aeb02ef8cd9ebfa7d3bcaae48 (diff)
some work for version 1.0.24-2
Diffstat (limited to 'debian/patches/multiarch_dll_search_path.patch')
-rw-r--r--debian/patches/multiarch_dll_search_path.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/multiarch_dll_search_path.patch b/debian/patches/multiarch_dll_search_path.patch
new file mode 100644
index 0000000..703a408
--- /dev/null
+++ b/debian/patches/multiarch_dll_search_path.patch
@@ -0,0 +1,42 @@
+Description: Keep /usr/lib/sane as a fallback for SANE backends
+ Make /usr/lib/arch_triplet/sane the default location for SANE backends,
+ but keep /usr/lib/sane as a fallback for now.
+Author: Julien BLACHE <jblache@debian.org>
+
+--- a/backend/dll.c
++++ b/backend/dll.c
+@@ -430,7 +430,7 @@
+
+ if (path)
+ {
+- src_len = strlen (path) + strlen (STRINGIFY (LIBDIR)) + 1 + 1;
++ src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1;
+ src = malloc (src_len);
+ if (!src)
+ {
+@@ -438,12 +438,11 @@
+ return SANE_STATUS_NO_MEM;
+ }
+ orig_src = src;
+- snprintf (src, src_len, "%s:%s", path, STRINGIFY (LIBDIR));
++ snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR);
+ }
+ else
+ {
+- src = STRINGIFY (LIBDIR);
+- src = strdup (src);
++ src = strdup (DEB_DLL_LIBDIR);
+ if (!src)
+ {
+ DBG (1, "load: strdup failed: %s\n", strerror (errno));
+--- a/backend/Makefile.in
++++ b/backend/Makefile.in
+@@ -1868,7 +1868,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane"
++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\""
+ AM_LDFLAGS = @STRICT_LDFLAGS@
+ # The -rpath option is added because we are creating _LTLIBRARIES based
+ # on configure substitution. This causes automake to not know the