← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to debian/patches/fix-configure-for-multiarch

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-configure-for-multiarch
 
1
Crude debian-specific fix by just patching generated configure script.
 
2
 
 
3
There's a patch for this issue in upstream's trac but it's against 2.9.x and
 
4
doesn't apply to 2.8.x.
 
5
 
 
6
--- a/configure
 
7
+++ b/configure
 
8
@@ -25060,6 +25060,8 @@ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
 
9
 echo "${ECHO_T}$wx_cv_std_libpath" >&6
 
10
 
 
11
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
 
12
+debian_multiarch_triplet=`dpkg-architecture -qDEB_HOST_MULTIARCH`
 
13
+SEARCH_LIB="/lib/$debian_multiarch_triplet /usr/lib/$debian_multiarch_triplet $SEARCH_LIB"
 
14
 
 
15
 if test "$build" != "$host" -a "$GCC" = yes; then
 
16
                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then