diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups/libexecdir.patch')
-rw-r--r-- | meta/recipes-extended/cups/cups/libexecdir.patch | 35 |
1 files changed, 35 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..7ccad94f0f --- /dev/null +++ b/meta/recipes-extended/cups/cups/libexecdir.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 13 Jul 2021 12:56:30 +0100 | ||
4 | Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this | ||
5 | breaks multilib builds. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
9 | |||
10 | --- | ||
11 | config-scripts/cups-directories.m4 | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 | ||
15 | index 2033d47..230166e 100644 | ||
16 | --- a/config-scripts/cups-directories.m4 | ||
17 | +++ b/config-scripts/cups-directories.m4 | ||
18 | @@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) | ||
19 | AS_CASE(["$host_os_name"], [*-gnu], [ | ||
20 | # GNUs | ||
21 | INSTALL_SYSV="install-sysv" | ||
22 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
23 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
24 | ], [*bsd* | darwin*], [ | ||
25 | # *BSD and Darwin (macOS) | ||
26 | INSTALL_SYSV="" | ||
27 | @@ -247,7 +247,7 @@ AS_CASE(["$host_os_name"], [*-gnu], [ | ||
28 | ], [*], [ | ||
29 | # All others | ||
30 | INSTALL_SYSV="install-sysv" | ||
31 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
32 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
33 | ]) | ||
34 | |||
35 | AC_DEFINE_UNQUOTED([CUPS_SERVERBIN], ["$CUPS_SERVERBIN"], [Location of server programs.]) | ||