diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/autogen | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/autogen')
4 files changed, 124 insertions, 0 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.6.bb new file mode 100644 index 000000000..d77b8273e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb @@ -0,0 +1,36 @@ +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://increase-timeout-limit.patch \ + file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ + file://redirect-output-dir.patch \ +" + +SRC_URI[md5sum] = "fdee403e524c0af3ded6b3becb365671" +SRC_URI[sha256sum] = "2fc7f12a5ecb3b1e8bd4364aa906b837cff01f80edb7d2fb38ed8b9dfbcd3271" + +UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/" +UPSTREAM_CHECK_REGEX = "rel(?P<pver>\d+(\.\d+)+)/" + +DEPENDS = "guile-native libtool-native libxml2-native" + +inherit autotools texinfo native pkgconfig + +# 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/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch new file mode 100644 index 000000000..9efd7e558 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] autogen: increase timeout limit for shell commands + +On some overloaded hosts, shell commands of autogen may can not +finish in 5 secs. This has caused many build failures, so increase +the timeout limit to fix this. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 58a848b..170dd9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -178,9 +178,9 @@ time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null` + if test -z "${AG_TIMEOUT}" + then + if test -z "${time_delta}" +- then time_delta=10 +- elif test ${time_delta} -lt 5 +- then time_delta=5 ; fi ++ then time_delta=60 ++ elif test ${time_delta} -lt 30 ++ then time_delta=30 ; fi + + AG_TIMEOUT=${time_delta} + fi diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch new file mode 100644 index 000000000..e56da7b1d --- /dev/null +++ b/import-layers/yocto-poky/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=`<subcommands>` 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 <Qi.Chen@windriver.com> +--- + 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 '\<noreturn\>'` ++ xargs grep -l -E '\<noreturn\>' ; exit 0` + + test -z "$list" && exit 0 + +-- +1.7.9.5 + 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 new file mode 100644 index 000000000..fc5a71b85 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch @@ -0,0 +1,28 @@ +[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 + |