From: Alessio Treglia <alessio@debian.org>
Date: Fri, 3 Feb 2012 16:38:01 +0000 (+0100)
Subject: Patch configure to adhere MultiArch.
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1~1^2~275
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1d2b95dc814807ec7ca9378de29c0a625ead5a00;p=gpac.git

Patch configure to adhere MultiArch.
---

diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..16dd73c
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,37 @@
+Author: Alessio Treglia <alessio@debian.org>
+Description: Process configure's --libdir option to set the shared library
+ installation path properly.
+Forwarded: no
+---
+ configure |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- gpac.orig/configure
++++ gpac/configure
+@@ -271,6 +271,8 @@ for opt do
+     case "$opt" in
+         --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
+             ;;
++        --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
++            ;;
+         --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
+             ;;
+         --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
+@@ -313,9 +315,6 @@ case "$cpu" in
+         if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
+             if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
+                 cpu="x86_64"
+-                if test "$linux" = "yes" ; then
+-                    libdir="lib64"
+-                fi
+                 want_pic="yes"
+             fi
+         fi
+@@ -328,7 +327,6 @@ case "$cpu" in
+         ;;
+     ppc64)
+         cpu="powerpc"
+-        libdir="lib64"
+         ;;  
+     "Power Macintosh"|ppc)
+         cpu="powerpc"
diff --git a/debian/patches/series b/debian/patches/series
index b9c0597..419bacf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 soname-fix.patch
 mp4box-manpage-fix.patch
+multiarch.patch