diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/autogen')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb (renamed from import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb) | 6 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch | 37 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch | 28 |
3 files changed, 40 insertions, 31 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb index d77b8273e..274427c7e 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb @@ -11,11 +11,11 @@ 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://redirect-output-dir.patch \ + file://fix-script-err-when-processing-libguile.patch \ " -SRC_URI[md5sum] = "fdee403e524c0af3ded6b3becb365671" -SRC_URI[sha256sum] = "2fc7f12a5ecb3b1e8bd4364aa906b837cff01f80edb7d2fb38ed8b9dfbcd3271" +SRC_URI[md5sum] = "2d1b5226e1929d0680011df631289571" +SRC_URI[sha256sum] = "0b8681d9724c481d3b726b5a9e81d3d09dc7f307d1a801c76d0a30d8f843d20a" UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/" UPSTREAM_CHECK_REGEX = "rel(?P<pver>\d+(\.\d+)+)/" diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch new file mode 100644 index 000000000..694a3953e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch @@ -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 diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch deleted file mode 100644 index fc5a71b85..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] redirect the dir of mklibsrc-log.tx - -Upstream-Status: Pending - -redirect mklibsrc-log.tx to builddir, not /tmp; otherwise mklibsrc-log.tx -maybe unable to be written if other users is building autogen at the same time. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - pkg/libopts/mklibsrc.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkg/libopts/mklibsrc.sh b/pkg/libopts/mklibsrc.sh -index 416b402..d612fbc 100644 ---- a/pkg/libopts/mklibsrc.sh -+++ b/pkg/libopts/mklibsrc.sh -@@ -19,7 +19,7 @@ - ## with this program. If not, see <http://www.gnu.org/licenses/>. - - set -ex --exec 2> /tmp/mklibsrc-log.tx -+exec 2> $top_builddir/mklibsrc-log.tx - - top_builddir=`cd $top_builddir ; pwd` - top_srcdir=`cd $top_srcdir ; pwd` --- -1.9.1 - |
