Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 1 | From 705c0a7e9d9c1e64ee09fc0b54f6b5a4e27de1ca Mon Sep 17 00:00:00 2001 |
| 2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> |
| 3 | Date: Fri, 17 Apr 2020 06:31:35 -0700 |
| 4 | Subject: [PATCH] support/apxs.in: force destdir to be empty string |
| 5 | |
| 6 | If destdir is assigned to anything other than the empty string, the |
| 7 | search path for apache2 config files is appended to itself, and |
| 8 | related 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: |
| 12 | No 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 |
| 14 | line 213. |
| 15 | |
| 16 | Ensure that it is always the empty string so that apache-websocket |
| 17 | is able to find the required config files. |
| 18 | |
| 19 | Upstream-Status: Inappropriate (embedded-specific) |
| 20 | |
| 21 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
| 22 | --- |
| 23 | support/apxs.in | 10 ++++++---- |
| 24 | 1 file changed, 6 insertions(+), 4 deletions(-) |
| 25 | |
| 26 | diff --git a/support/apxs.in b/support/apxs.in |
| 27 | index 65e1288527..9d96e33728 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 | -- |
| 48 | 2.17.1 |
| 49 | |