diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups')
5 files changed, 38 insertions, 93 deletions
diff --git a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index ea248e4710..2bc26edbfc 100644 --- a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch @@ -26,48 +26,6 @@ index 32e2e0b..f1478d4 100644 # -@@ -205,9 +205,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ - $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -- echo Testing PPD compiler... -- ./ppdc-static -l en,fr -I ../data foo.drv -- ./ppdc-static -l en,fr -z -I ../data foo.drv -+# echo Testing PPD compiler... -+# ./ppdc-static -l en,fr -I ../data foo.drv -+# ./ppdc-static -l en,fr -z -I ../data foo.drv - - - # -@@ -235,17 +235,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ - $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -- echo Testing PPD importer... -- $(RM) -r ppd ppd2 sample-import.drv -- ./ppdc-static -l en -I ../data sample.drv -- ./ppdi-static -I ../data -o sample-import.drv ppd/* -- ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv -- if diff -r ppd ppd2 >/dev/null; then \ -- echo PPD import OK; \ -- else \ -- echo PPD import FAILED; \ -- exit 1; \ -- fi -+# echo Testing PPD importer... -+# $(RM) -r ppd ppd2 sample-import.drv -+# ./ppdc-static -l en -I ../data sample.drv -+# ./ppdi-static -I ../data -o sample-import.drv ppd/* -+# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv -+# if diff -r ppd ppd2 >/dev/null; then \ -+# echo PPD import OK; \ -+# else \ -+# echo PPD import FAILED; \ -+# exit 1; \ -+# fi - - - # -- 2.17.1 diff --git a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch b/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch deleted file mode 100644 index b48c7a9ad2..0000000000 --- a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 22 Jul 2012 16:54:17 -0700 -Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64 - -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] - -Update on 20190904: -Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction -when multilib is enabled. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - config-scripts/cups-directories.m4 | 2 +- - configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 -index b74083a..9a5abb2 100644 ---- a/config-scripts/cups-directories.m4 -+++ b/config-scripts/cups-directories.m4 -@@ -270,7 +270,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac - -diff --git a/configure b/configure -index d3df145..bc68a6c 100755 ---- a/configure -+++ b/configure -@@ -6420,7 +6420,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac - --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/cups-volatiles.conf b/meta/recipes-extended/cups/cups/cups-volatiles.conf new file mode 100644 index 0000000000..0ede78e1c8 --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups-volatiles.conf @@ -0,0 +1 @@ +d /var/log/cups 0755 root root - diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch new file mode 100644 index 0000000000..7ccad94f0f --- /dev/null +++ b/meta/recipes-extended/cups/cups/libexecdir.patch @@ -0,0 +1,35 @@ +From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 13 Jul 2021 12:56:30 +0100 +Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this + breaks multilib builds. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +--- + config-scripts/cups-directories.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 +index 2033d47..230166e 100644 +--- a/config-scripts/cups-directories.m4 ++++ b/config-scripts/cups-directories.m4 +@@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) + AS_CASE(["$host_os_name"], [*-gnu], [ + # GNUs + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ], [*bsd* | darwin*], [ + # *BSD and Darwin (macOS) + INSTALL_SYSV="" +@@ -247,7 +247,7 @@ AS_CASE(["$host_os_name"], [*-gnu], [ + ], [*], [ + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ]) + + AC_DEFINE_UNQUOTED([CUPS_SERVERBIN], ["$CUPS_SERVERBIN"], [Location of server programs.]) diff --git a/meta/recipes-extended/cups/cups/volatiles.99_cups b/meta/recipes-extended/cups/cups/volatiles.99_cups new file mode 100644 index 0000000000..cc0e19e4c8 --- /dev/null +++ b/meta/recipes-extended/cups/cups/volatiles.99_cups @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d root root 0755 /var/log/cups none |