diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch')
-rw-r--r-- | meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch | 51 |
1 files changed, 0 insertions, 51 deletions
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 @@ | |||
1 | From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 22 Jul 2012 16:54:17 -0700 | ||
4 | Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64 | ||
5 | |||
6 | Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches | ||
7 | e.g. ppc64 where base libdir is lib64 this does not go well | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Inappropriate [OE config specific] | ||
11 | |||
12 | Update on 20190904: | ||
13 | Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction | ||
14 | when multilib is enabled. | ||
15 | |||
16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
17 | |||
18 | --- | ||
19 | config-scripts/cups-directories.m4 | 2 +- | ||
20 | configure | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 | ||
24 | index b74083a..9a5abb2 100644 | ||
25 | --- a/config-scripts/cups-directories.m4 | ||
26 | +++ b/config-scripts/cups-directories.m4 | ||
27 | @@ -270,7 +270,7 @@ case "$host_os_name" in | ||
28 | *) | ||
29 | # All others | ||
30 | INSTALL_SYSV="install-sysv" | ||
31 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
32 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
33 | ;; | ||
34 | esac | ||
35 | |||
36 | diff --git a/configure b/configure | ||
37 | index d3df145..bc68a6c 100755 | ||
38 | --- a/configure | ||
39 | +++ b/configure | ||
40 | @@ -6420,7 +6420,7 @@ case "$host_os_name" in | ||
41 | *) | ||
42 | # All others | ||
43 | INSTALL_SYSV="install-sysv" | ||
44 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
45 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
46 | ;; | ||
47 | esac | ||
48 | |||
49 | -- | ||
50 | 2.17.1 | ||
51 | |||