From 4690723161ef1a9632a9892bd0ec848ab527dd07 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 12 Jun 2016 01:25:03 -0700 Subject: autogen-native: 5.18.6 -> 5.18.10 Removed redirect-output-dir.patch, there is no /tmp/mklibsrc-log.tx, so the patch is not needed any more. (From OE-Core rev: bb5c0e91063f705c5e1ce319b4742e06f6aa4c97) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.18.10.bb | 35 +++++++++++++++++++++ .../autogen/autogen-native_5.18.6.bb | 36 ---------------------- .../autogen/autogen/redirect-output-dir.patch | 28 ----------------- 3 files changed, 35 insertions(+), 64 deletions(-) create mode 100644 meta/recipes-devtools/autogen/autogen-native_5.18.10.bb delete mode 100644 meta/recipes-devtools/autogen/autogen-native_5.18.6.bb delete mode 100644 meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb new file mode 100644 index 0000000000..fd52c83bd0 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb @@ -0,0 +1,35 @@ +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 \ +" + +SRC_URI[md5sum] = "2d1b5226e1929d0680011df631289571" +SRC_URI[sha256sum] = "0b8681d9724c481d3b726b5a9e81d3d09dc7f307d1a801c76d0a30d8f843d20a" + +UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/" +UPSTREAM_CHECK_REGEX = "rel(?P\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/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb deleted file mode 100644 index d77b8273e2..0000000000 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb +++ /dev/null @@ -1,36 +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://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\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/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch b/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch deleted file mode 100644 index fc5a71b859..0000000000 --- a/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 ---- - 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 . - - 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 - -- cgit 1.2.3-korg