sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

autogen-native: fix script error when processing libguile 

do_configure for autogen-native would fail if build directory path
contains '-I' characters, which is caused by the unsuitable sed script
when processing libguile.

Error log:
[snip]
checking for GUILE... yes
awk: fatal: cannot open file `/buildarea1/poky/build /libguile/version.h' for reading (No such file or directory)
configure: error: in `/buildarea1/poky/build-Ice/tmp/work/x86_64-linux/autogen-native/5.18.10-r0/build':
configure: error: cannot determine Guile version
[snip]

(From OE-Core rev: 2004307044e958cdf508b72f180e238a3e297179)

Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Zhenbo Gao 2016-07-05 16:25:15 +08:00 committed by Richard Purdie
parent e4224fb50d
commit 74c5cd0c2c
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/autogen/autogen-native_5.18.10.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
file://increase-timeout-limit.patch \
file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \
file://fix-script-err-when-processing-libguile.patch \
"
SRC_URI[md5sum] = "2d1b5226e1929d0680011df631289571"

37
meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch Normal file
View File

@ -0,0 +1,37 @@
autogen-native: fix script err when processing libguile
do_configure for autogen will fail if project directory path
contains '-I' character, which is caused by the unsuitable sed
script when processing libguile.
Upstream-Status: Pending
Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
index 58186b6..58ed2ad 100644
--- a/config/ag_macros.m4
+++ b/config/ag_macros.m4
@@ -32,7 +32,7 @@ AC_DEFUN([INVOKE_AG_MACROS_LAST],[
GUILE_FLAGS
[ag_gv=`gdir=\`pkg-config --cflags-only-I \
guile-${GUILE_EFFECTIVE_VERSION} | \
- sed 's/-I *//;s/ *-I.*/ /g'\`
+ sed 's/ *-I *\// \//g'\`
for d in $gdir
do test -f "$d/libguile/version.h" && gdir=$d && break
done
diff --git a/config/misc.def b/config/misc.def
index 490d361..6e183ef 100644
--- a/config/misc.def
+++ b/config/misc.def
@@ -342,7 +342,7 @@ do-always = <<- _END_ALWAYS_
GUILE_FLAGS
[ag_gv=`gdir=\`pkg-config --cflags-only-I \
guile-${GUILE_EFFECTIVE_VERSION} | \
- sed 's/-I *//;s/ *-I.*/ /g'\`
+ sed 's/ *-I *\// \//g'\`
test -z "$gdir" && gdir=/usr/include
for d in $gdir
do test -f "$d/libguile/version.h" && gdir=$d && break