diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups/cups_serverbin.patch')
-rw-r--r-- | meta/recipes-extended/cups/cups/cups_serverbin.patch | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch index f7b44a7bc1..85c6af1071 100644 --- a/meta/recipes-extended/cups/cups/cups_serverbin.patch +++ b/meta/recipes-extended/cups/cups/cups_serverbin.patch | |||
@@ -4,6 +4,12 @@ e.g. ppc64 where base libdir is lib64 this does not go well | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
5 | Upstream-Status: Inappropriate [OE config specific] | 5 | Upstream-Status: Inappropriate [OE config specific] |
6 | 6 | ||
7 | Update on 20190904: | ||
8 | Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction | ||
9 | when multilib is enabled. | ||
10 | |||
11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
12 | |||
7 | Index: cups-1.4.6/config-scripts/cups-directories.m4 | 13 | Index: cups-1.4.6/config-scripts/cups-directories.m4 |
8 | =================================================================== | 14 | =================================================================== |
9 | --- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 | 15 | --- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 |
@@ -13,7 +19,7 @@ Index: cups-1.4.6/config-scripts/cups-directories.m4 | |||
13 | # All others | 19 | # All others |
14 | INSTALL_SYSV="install-sysv" | 20 | INSTALL_SYSV="install-sysv" |
15 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | 21 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" |
16 | + CUPS_SERVERBIN="$libdir/cups" | 22 | + CUPS_SERVERBIN="$libexecdir/cups" |
17 | ;; | 23 | ;; |
18 | esac | 24 | esac |
19 | 25 | ||
@@ -26,7 +32,7 @@ Index: cups-1.4.6/configure | |||
26 | # All others | 32 | # All others |
27 | INSTALL_SYSV="install-sysv" | 33 | INSTALL_SYSV="install-sysv" |
28 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | 34 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" |
29 | + CUPS_SERVERBIN="$libdir/cups" | 35 | + CUPS_SERVERBIN="$libexecdir/cups" |
30 | ;; | 36 | ;; |
31 | esac | 37 | esac |
32 | 38 | ||