diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-07-22 16:54:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-26 14:40:46 +0100 |
commit | 171cb4683015fd362236ed5f597310e7950e1f70 (patch) | |
tree | 21a59797aa03fa66ea70716c9027b54a559aed86 /meta/recipes-extended/cups/cups14.inc | |
parent | bedae2815e362f484c309fbaa67d499102b2781d (diff) | |
download | poky-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/cups14.inc')
-rw-r--r-- | meta/recipes-extended/cups/cups14.inc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index 4f2b0a1dc4..0517007acd 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc | |||
@@ -27,7 +27,7 @@ EXTRA_OECONF = " \ | |||
27 | do_configure() { | 27 | do_configure() { |
28 | gnu-configize | 28 | gnu-configize |
29 | libtoolize --force | 29 | libtoolize --force |
30 | DSOFLAGS="${LDFLAGS}" oe_runconf | 30 | DSOFLAGS="${LDFLAGS}" SERVERBIN="${libdir}/cups" oe_runconf |
31 | } | 31 | } |
32 | 32 | ||
33 | do_compile () { | 33 | do_compile () { |
@@ -66,24 +66,24 @@ python do_package_append() { | |||
66 | 66 | ||
67 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 67 | PACKAGES =+ "${PN}-lib ${PN}-libimage" |
68 | 68 | ||
69 | FILES_${PN} += "${exec_prefix}/lib/cups/backend \ | 69 | FILES_${PN} += "${libdir}/cups/backend \ |
70 | ${exec_prefix}/lib/cups/cgi-bin \ | 70 | ${libdir}/cups/cgi-bin \ |
71 | ${exec_prefix}/lib/cups/filter \ | 71 | ${libdir}/cups/filter \ |
72 | ${exec_prefix}/lib/cups/monitor \ | 72 | ${libdir}/cups/monitor \ |
73 | ${exec_prefix}/lib/cups/notifier \ | 73 | ${libdir}/cups/notifier \ |
74 | ${exec_prefix}/lib/cups/daemon \ | 74 | ${libdir}/cups/daemon \ |
75 | " | 75 | " |
76 | 76 | ||
77 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | 77 | FILES_${PN}-lib = "${libdir}/libcups.so.*" |
78 | 78 | ||
79 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | 79 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" |
80 | 80 | ||
81 | FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \ | 81 | FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ |
82 | ${exec_prefix}/lib/cups/cgi-bin/.debug \ | 82 | ${libdir}/cups/cgi-bin/.debug \ |
83 | ${exec_prefix}/lib/cups/filter/.debug \ | 83 | ${libdir}/cups/filter/.debug \ |
84 | ${exec_prefix}/lib/cups/monitor/.debug \ | 84 | ${libdir}/cups/monitor/.debug \ |
85 | ${exec_prefix}/lib/cups/notifier/.debug \ | 85 | ${libdir}/cups/notifier/.debug \ |
86 | ${exec_prefix}/lib/cups/daemon/.debug \ | 86 | ${libdir}/cups/daemon/.debug \ |
87 | " | 87 | " |
88 | 88 | ||
89 | #package the html for the webgui inside the main packages (~1MB uncompressed) | 89 | #package the html for the webgui inside the main packages (~1MB uncompressed) |