1From 43a4ad04e0d8771267a73f98b5918bcd10b167ec Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <trevor.gamblin@windriver.com>
3Date: Fri, 17 Apr 2020 06:31:35 -0700
4Subject: [PATCH] support/apxs.in: force destdir to be empty string
5
6If destdir is assigned to anything other than the empty string, the
7search path for apache2 config files is appended to itself, and
8related packages like apache-websocket will be unable to locate them:
9
10| cannot open
11/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot//usr/share/apache2/build/config_vars.mk:
12No such file or directory at
13/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/usr/bin/crossscripts/apxs
14line 213.
15
16Ensure that it is always the empty string so that apache-websocket
17is able to find the required config files.
18
19Upstream-Status: Inappropriate (embedded-specific)
20
21Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
22---
23 support/apxs.in | 10 ++++++----
24 1 file changed, 6 insertions(+), 4 deletions(-)
25
26diff --git a/support/apxs.in b/support/apxs.in
27index b2705fa..781f2ab 100644
28--- a/support/apxs.in
29+++ b/support/apxs.in
30@@ -28,10 +28,12 @@ package apxs;
31 #   is the empty string.
32
33 my $destdir = "";
34-my $ddi = rindex($0, "@exp_bindir@");
35-if ($ddi >= 0) {
36-  $destdir = substr($0, 0, $ddi);
37-}
38+# Comment out assignment of destdir so that it doesn't affect bitbake
39+# cross-compilation setup
40+#my $ddi = rindex($0, "@exp_bindir@");
41+#if ($ddi >= 0) {
42+#  $destdir = substr($0, 0, $ddi);
43+#}
44
45 my %config_vars = ();
46
47--
482.25.1
49
50