summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cups
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/cups')
-rw-r--r--meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch32
-rw-r--r--meta/recipes-extended/cups/cups14.inc26
-rw-r--r--meta/recipes-extended/cups/cups_1.4.6.bb7
3 files changed, 49 insertions, 16 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
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 = " \
27do_configure() { 27do_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
33do_compile () { 33do_compile () {
@@ -66,24 +66,24 @@ python do_package_append() {
66 66
67PACKAGES =+ "${PN}-lib ${PN}-libimage" 67PACKAGES =+ "${PN}-lib ${PN}-libimage"
68 68
69FILES_${PN} += "${exec_prefix}/lib/cups/backend \ 69FILES_${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
77FILES_${PN}-lib = "${libdir}/libcups.so.*" 77FILES_${PN}-lib = "${libdir}/libcups.so.*"
78 78
79FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" 79FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
80 80
81FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \ 81FILES_${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)
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index 98251380da..84851804af 100644
--- a/meta/recipes-extended/cups/cups_1.4.6.bb
+++ b/meta/recipes-extended/cups/cups_1.4.6.bb
@@ -1,13 +1,14 @@
1require cups14.inc 1require cups14.inc
2 2
3PR = "r4" 3PR = "r5"
4DEPENDS += "libusb \ 4DEPENDS += "libusb \
5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
6 6
7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9" 7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
8SRC_URI += " \ 8SRC_URI += " \
9 file://use_echo_only_in_init.patch \ 9 file://use_echo_only_in_init.patch \
10 file://0001-don-t-try-to-run-generated-binaries.patch \ 10 file://0001-don-t-try-to-run-generated-binaries.patch \
11 file://cups_serverbin.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1" 14SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"