diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2012-12-13 19:03:52 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-19 17:50:04 +0000 |
| commit | 9524c0ed85592c87ff30b54ca705b5d1b447eb6f (patch) | |
| tree | 410dee27a30a0557fd3643187f963de9a97dc9cd /meta/recipes-extended/cups/cups/cups_serverbin.patch | |
| parent | 8b4b9c1329c4bfd265ad4962aa61f5e61e10d1e7 (diff) | |
| download | openembedded-core-contrib-9524c0ed85592c87ff30b54ca705b5d1b447eb6f.tar.gz | |
cups: Update to 1.6.1
License change was due to update of Date.
Remove CVE patches as they where backports from this release
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/cups/cups/cups_serverbin.patch')
| -rw-r--r-- | meta/recipes-extended/cups/cups/cups_serverbin.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch new file mode 100644 index 0000000000..f7b44a7bc1 --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups_serverbin.patch @@ -0,0 +1,32 @@ +Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches +e.g. ppc64 where base libdir is lib64 this does not go well + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Inappropriate [OE config specific] + +Index: cups-1.4.6/config-scripts/cups-directories.m4 +=================================================================== +--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 ++++ cups-1.4.6/config-scripts/cups-directories.m4 2012-07-21 12:12:05.896405923 -0700 +@@ -397,7 +397,7 @@ + *) + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libdir/cups" + ;; + esac + +Index: cups-1.4.6/configure +=================================================================== +--- cups-1.4.6.orig/configure 2012-07-21 12:13:34.512405950 -0700 ++++ cups-1.4.6/configure 2012-07-21 12:14:05.724406017 -0700 +@@ -11181,7 +11181,7 @@ + *) + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libdir/cups" + ;; + esac + |