← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libapache-mod-log-sql/vivid

« back to all changes in this revision

Viewing changes to debian/patches/010-search-libdbi-with-multiarch-support.patch

  • Committer: Package Import Robot
  • Author(s): Thomas Goirand
  • Date: 2014-05-06 10:21:09 UTC
  • Revision ID: package-import@ubuntu.com-20140506102109-6445s92f378tebbj
Tags: 1.100-16
http://bugs.debian.org/738377
http://bugs.debian.org/542078
http://bugs.debian.org/727392
http://bugs.debian.org/520388
http://bugs.debian.org/700583
* Patches configure script to search libdbi in a multiarch system
  (Closes: #738377, #542078).
* Calls dh_autotools-dev_updateconfig before the configuration script,
  thanks to Matthias Klose <doko@debian.org> for reporting (Closes: #727392).
* Fixes misnamed in create_tables.sql (Closes: #520388).
* Fixed long description (Closes: #700583).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/010-search-libdbi-with-multiarch-support.patch
 
1
Description: Search for libdbi shared libs in multiarch env
 
2
 The libdbi were searched only in /usr/lib, the configure script must
 
3
 also search in ${dbi_path}/lib/${DEB_HOST_MULTIARCH}.
 
4
Author: Thomas Goirand <zigo@debian.org>
 
5
Bug-Debian: http://bugs.debian.org/738377
 
6
Last-Update: 2014-05-06
 
7
 
 
8
--- libapache-mod-log-sql-1.100.orig/configure
 
9
+++ libapache-mod-log-sql-1.100/configure
 
10
@@ -3245,6 +3245,11 @@ else
 
11
     test_paths="${dbi_path}/lib"
 
12
 fi
 
13
 
 
14
+if [ -x /usr/bin/dpkg-architecture ] ; then
 
15
+       DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
 
16
+       test_paths="${dbi_path}/lib ${dbi_path}/lib/${DEB_HOST_MULTIARCH}"
 
17
+fi
 
18
+
 
19
 for x in $test_paths ; do
 
20
     echo "$as_me:$LINENO: checking for libdbi library in ${x}" >&5
 
21
 echo $ECHO_N "checking for libdbi library in ${x}... $ECHO_C" >&6