summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-06-15 16:21:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 15:52:17 +0100
commit44da0d9467f4fbd6b10f8fb85e79755b3c7a14cd (patch)
treecc13c6dead62689583ac79bc0238a6da60ad3f75
parent9dad33e9b25c04d71f36bb83d71e098a9cbdda71 (diff)
downloadpoky-44da0d9467f4fbd6b10f8fb85e79755b3c7a14cd.tar.gz
autogen-native: remove the recipe
With grub no longer requiring it, there's nothing else in oe-core or meta-oe that does. (From OE-Core rev: 765fec2f363aeb0540970c57217a2ea1aab8e088) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/autogen/autogen-native_5.18.12.bb40
-rw-r--r--meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch39
-rw-r--r--meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch32
-rw-r--r--meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch37
-rw-r--r--meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch30
-rw-r--r--meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch30
6 files changed, 0 insertions, 208 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb
deleted file mode 100644
index 853477cf7c..0000000000
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1SUMMARY = "Automated text and program generation tool"
2DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\
3 maintenance of programs that contain large amounts of repetitious text.\
4 It is especially valuable in programs that have several blocks of text\
5 that must be kept synchronized."
6HOMEPAGE = "http://www.gnu.org/software/autogen/"
7SECTION = "devel"
8LICENSE = "GPLv3"
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10
11SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
12 file://increase-timeout-limit.patch \
13 file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \
14 file://fix-script-err-when-processing-libguile.patch \
15 file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \
16 file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \
17"
18
19SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389"
20SRC_URI[sha256sum] = "805c20182f3cb0ebf1571d3b01972851c56fb34348dfdc38799fd0ec3b2badbe"
21
22UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/"
23UPSTREAM_CHECK_REGEX = "rel(?P<pver>\d+(\.\d+)+)/"
24
25DEPENDS = "guile-native libtool-native libxml2-native"
26
27inherit autotools texinfo native pkgconfig
28
29# autogen-native links against libguile which may have been relocated with sstate
30# these environment variables ensure there isn't a relocation issue
31export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0"
32export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache"
33
34export POSIX_SHELL = "/usr/bin/env sh"
35
36do_install_append () {
37 create_wrapper ${D}/${bindir}/autogen \
38 GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
39 GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
40}
diff --git a/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch b/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch
deleted file mode 100644
index a14018e339..0000000000
--- a/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 45040e7d268329ebc40e6cb237c64a6637cfab5c Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 13 Mar 2017 20:22:10 -0700
4Subject: [PATCH] config/libopts.m4: regenerate it from config/libopts.def
5
6It was out of date compared to config/libopts.def, so regenerate it via
7"autogen config/libopts.def" command.
8
9Upstream-Status: Pending
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 config/libopts.m4 | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/config/libopts.m4 b/config/libopts.m4
17index c7ba4f3..51e6a39 100644
18--- a/config/libopts.m4
19+++ b/config/libopts.m4
20@@ -2,7 +2,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro:
21 dnl
22 dnl DO NOT EDIT THIS FILE (libopts.m4)
23 dnl
24-dnl It has been AutoGen-ed
25+dnl It has been AutoGen-ed March 13, 2017 at 08:21:21 PM by AutoGen 5.18
26 dnl From the definitions libopts.def
27 dnl and the template file conftest.tpl
28 dnl
29@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
30 AC_PROG_SED
31 [while :
32 do
33+ test -x "$POSIX_SHELL" && break
34 POSIX_SHELL=`which bash`
35 test -x "$POSIX_SHELL" && break
36 POSIX_SHELL=`which dash`
37--
382.10.2
39
diff --git a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch
deleted file mode 100644
index d5fe143ce4..0000000000
--- a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 13 Mar 2017 20:33:30 -0700
4Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path
5
6Use "which perl" as shebang doesn't work when it is longer than
7BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to
8instead of.
9
10Upstream-Status: Pending
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 autoopts/mk-tpl-config.sh | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh
18index 093e808..8dfc6dd 100755
19--- a/autoopts/mk-tpl-config.sh
20+++ b/autoopts/mk-tpl-config.sh
21@@ -98,7 +98,7 @@ fix_scripts() {
22 st=`sed 1q $f`
23
24 case "$st" in
25- *perl ) echo '#!' `which perl`
26+ *perl ) echo '#!/usr/bin/env perl'
27 sed 1d $f
28 ;;
29
30--
312.10.2
32
diff --git a/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch b/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch
deleted file mode 100644
index 694a3953ea..0000000000
--- a/meta/recipes-devtools/autogen/autogen/fix-script-err-when-processing-libguile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1autogen-native: fix script err when processing libguile
2
3do_configure for autogen will fail if project directory path
4contains '-I' character, which is caused by the unsuitable sed
5script when processing libguile.
6
7Upstream-Status: Pending
8
9Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com>
10Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11
12diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
13index 58186b6..58ed2ad 100644
14--- a/config/ag_macros.m4
15+++ b/config/ag_macros.m4
16@@ -32,7 +32,7 @@ AC_DEFUN([INVOKE_AG_MACROS_LAST],[
17 GUILE_FLAGS
18 [ag_gv=`gdir=\`pkg-config --cflags-only-I \
19 guile-${GUILE_EFFECTIVE_VERSION} | \
20- sed 's/-I *//;s/ *-I.*/ /g'\`
21+ sed 's/ *-I *\// \//g'\`
22 for d in $gdir
23 do test -f "$d/libguile/version.h" && gdir=$d && break
24 done
25diff --git a/config/misc.def b/config/misc.def
26index 490d361..6e183ef 100644
27--- a/config/misc.def
28+++ b/config/misc.def
29@@ -342,7 +342,7 @@ do-always = <<- _END_ALWAYS_
30 GUILE_FLAGS
31 [ag_gv=`gdir=\`pkg-config --cflags-only-I \
32 guile-${GUILE_EFFECTIVE_VERSION} | \
33- sed 's/-I *//;s/ *-I.*/ /g'\`
34+ sed 's/ *-I *\// \//g'\`
35 test -z "$gdir" && gdir=/usr/include
36 for d in $gdir
37 do test -f "$d/libguile/version.h" && gdir=$d && break
diff --git a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
deleted file mode 100644
index 9efd7e5587..0000000000
--- a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Subject: [PATCH] autogen: increase timeout limit for shell commands
2
3On some overloaded hosts, shell commands of autogen may can not
4finish in 5 secs. This has caused many build failures, so increase
5the timeout limit to fix this.
6
7Upstream-Status: Inappropriate [configuration]
8
9Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
10---
11 configure.ac | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 58a848b..170dd9e 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -178,9 +178,9 @@ time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null`
19 if test -z "${AG_TIMEOUT}"
20 then
21 if test -z "${time_delta}"
22- then time_delta=10
23- elif test ${time_delta} -lt 5
24- then time_delta=5 ; fi
25+ then time_delta=60
26+ elif test ${time_delta} -lt 30
27+ then time_delta=30 ; fi
28
29 AG_TIMEOUT=${time_delta}
30 fi
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
deleted file mode 100644
index e56da7b1da..0000000000
--- a/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Pending
2
3mk-tpl-config.sh: force exit value to be 0 in subprocess
4
5The return value of statement list=`<subcommands>` is the exit value of the
6subcommands. So if the subcommands fails, the compilation fails. This is obviously
7not intended. In the normal case, we expect the grep command to fail as there should
8be no 'noreturn' word in the libguile files.
9
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11---
12 autoopts/mk-tpl-config.sh | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh
16index 926f5ab..6b4a0fb 100755
17--- a/autoopts/mk-tpl-config.sh
18+++ b/autoopts/mk-tpl-config.sh
19@@ -202,7 +202,7 @@ fix_guile() {
20
21 list=`set +e ; exec 2>/dev/null
22 find ${libguiledir}/libguile* -type f | \
23- xargs grep -l -E '\<noreturn\>'`
24+ xargs grep -l -E '\<noreturn\>' ; exit 0`
25
26 test -z "$list" && exit 0
27
28--
291.7.9.5
30