blob: b48c7a9ad2fa7b0ca0c7b434f7764f3372eb17a1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
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
|
