summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-22 16:54:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:46 +0100
commit171cb4683015fd362236ed5f597310e7950e1f70 (patch)
tree21a59797aa03fa66ea70716c9027b54a559aed86 /meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
parentbedae2815e362f484c309fbaa67d499102b2781d (diff)
downloadpoky-171cb4683015fd362236ed5f597310e7950e1f70.tar.gz
cups_1.4.6.bb: Fix build on ppc64
ppc64 uses lib64 and usr/lib64 for library paths so we need to train cups build system (From OE-Core rev: c8de655e8f5b2ac8b72428252645022458460912) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch')
-rw-r--r--meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch b/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
new file mode 100644
index 0000000000..f7b44a7bc1
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
@@ -0,0 +1,32 @@
1Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
2e.g. ppc64 where base libdir is lib64 this does not go well
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Inappropriate [OE config specific]
6
7Index: cups-1.4.6/config-scripts/cups-directories.m4
8===================================================================
9--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700
10+++ cups-1.4.6/config-scripts/cups-directories.m4 2012-07-21 12:12:05.896405923 -0700
11@@ -397,7 +397,7 @@
12 *)
13 # All others
14 INSTALL_SYSV="install-sysv"
15- CUPS_SERVERBIN="$exec_prefix/lib/cups"
16+ CUPS_SERVERBIN="$libdir/cups"
17 ;;
18 esac
19
20Index: cups-1.4.6/configure
21===================================================================
22--- cups-1.4.6.orig/configure 2012-07-21 12:13:34.512405950 -0700
23+++ cups-1.4.6/configure 2012-07-21 12:14:05.724406017 -0700
24@@ -11181,7 +11181,7 @@
25 *)
26 # All others
27 INSTALL_SYSV="install-sysv"
28- CUPS_SERVERBIN="$exec_prefix/lib/cups"
29+ CUPS_SERVERBIN="$libdir/cups"
30 ;;
31 esac
32