diff options
| author |   Ross Burton <ross@burtonini.com> | 2021-07-13 12:56:30 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-19 13:33:28 +0100 |
| commit | 53bd9a96a003a7103b8475f9c1ad7ef999e34f87 (patch) | |
| tree | a429ec4b13bb5311e2bc4ce179d4f652ef5234ee /meta/recipes-extended/cups/cups/libexecdir.patch | |
| parent | 5185ddb19cae2afb948d0ce83ec1ee356c81965e (diff) | |
| download | openembedded-core-contrib-53bd9a96a003a7103b8475f9c1ad7ef999e34f87.tar.gz | |
cups: update to 2.3.3op2
Apple are no longer maintaining CUPS, and future development is now
happening under the OpenPrinting project:
https://ftp.pwg.org/pub/pwg/liaison/openprinting/presentations/cups-plenary-may-2021.pdf
Also stop disabling the manpage installation as manpages are useful, and
remove some patch chunks that are not required.
The CVE-2020-10001 patch is dropped as this is incorporated into 2.3.3op2.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups/cups/libexecdir.patch')
| -rw-r--r-- | meta/recipes-extended/cups/cups/libexecdir.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch new file mode 100644 index 0000000000..2e15841b0d --- /dev/null +++ b/meta/recipes-extended/cups/cups/libexecdir.patch @@ -0,0 +1,27 @@ +Use $libexecdir instead of hardcoding $prefix/lib as this breaks multilib builds. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 +index 1430af3a6..6efedc604 100644 +--- a/config-scripts/cups-directories.m4 ++++ b/config-scripts/cups-directories.m4 +@@ -265,7 +265,7 @@ case "$host_os_name" in + *-gnu) + # GNUs + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ;; + *bsd* | darwin*) + # *BSD and Darwin (macOS) +@@ -275,7 +275,7 @@ case "$host_os_name" in + *) + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ;; + esac +
\ No newline at end of file |