From 84052c30c7e4b845543c9704945170a55734343e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 6 Jun 2014 16:22:28 +0800 Subject: autogen-native: upgrade from 2.18.2 to 2.18.3 Upgrade autogen-native from 2.18.2 to 2.18.3. A patch is made to fix the compilation error. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.18.2.bb | 31 --------------------- .../autogen/autogen-native_5.18.3.bb | 32 ++++++++++++++++++++++ ...ig.sh-force-exit-value-to-be-0-in-subproc.patch | 30 ++++++++++++++++++++ 3 files changed, 62 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-devtools/autogen/autogen-native_5.18.2.bb create mode 100644 meta/recipes-devtools/autogen/autogen-native_5.18.3.bb create mode 100644 meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb deleted file mode 100644 index 92e7099f20..0000000000 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Automated text and program generation tool" -DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\ - maintenance of programs that contain large amounts of repetitious text.\ - It is especially valuable in programs that have several blocks of text\ - that must be kept synchronized." -HOMEPAGE = "http://www.gnu.org/software/autogen/" -SECTION = "devel" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ - file://guile.patch \ - file://increase-timeout-limit.patch" - -SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4" -SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068" - -DEPENDS = "guile-native libtool-native libxml2-native" - -inherit autotools texinfo native - -# autogen-native links against libguile which may have been relocated with sstate -# these environment variables ensure there isn't a relocation issue -export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" -export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" - -do_install_append () { - create_wrapper ${D}/${bindir}/autogen \ - GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ - GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache -} diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb new file mode 100644 index 0000000000..61bd21fc38 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb @@ -0,0 +1,32 @@ +SUMMARY = "Automated text and program generation tool" +DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\ + maintenance of programs that contain large amounts of repetitious text.\ + It is especially valuable in programs that have several blocks of text\ + that must be kept synchronized." +HOMEPAGE = "http://www.gnu.org/software/autogen/" +SECTION = "devel" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ + file://guile.patch \ + file://increase-timeout-limit.patch \ + file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch" + +SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f" +SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039" + +DEPENDS = "guile-native libtool-native libxml2-native" + +inherit autotools texinfo native + +# autogen-native links against libguile which may have been relocated with sstate +# these environment variables ensure there isn't a relocation issue +export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" +export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" + +do_install_append () { + create_wrapper ${D}/${bindir}/autogen \ + GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ + GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache +} diff --git a/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch b/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch new file mode 100644 index 0000000000..e56da7b1da --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch @@ -0,0 +1,30 @@ +Upstream-Status: Pending + +mk-tpl-config.sh: force exit value to be 0 in subprocess + +The return value of statement list=`` is the exit value of the +subcommands. So if the subcommands fails, the compilation fails. This is obviously +not intended. In the normal case, we expect the grep command to fail as there should +be no 'noreturn' word in the libguile files. + +Signed-off-by: Chen Qi +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 926f5ab..6b4a0fb 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -202,7 +202,7 @@ fix_guile() { + + list=`set +e ; exec 2>/dev/null + find ${libguiledir}/libguile* -type f | \ +- xargs grep -l -E '\'` ++ xargs grep -l -E '\' ; exit 0` + + test -z "$list" && exit 0 + +-- +1.7.9.5 + -- cgit 1.2.3-korg