summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/autogen
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/autogen')
-rw-r--r--meta/recipes-devtools/autogen/autogen-native_5.18.3.bb32
-rw-r--r--meta/recipes-devtools/autogen/autogen/guile.patch191
-rw-r--r--meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch33
-rw-r--r--meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch30
4 files changed, 286 insertions, 0 deletions
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..abc0a42102
--- /dev/null
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb
@@ -0,0 +1,32 @@
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://guile.patch \
13 file://increase-timeout-limit.patch \
14 file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch"
15
16SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f"
17SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039"
18
19DEPENDS = "guile-native libtool-native libxml2-native"
20
21inherit autotools texinfo native pkgconfig
22
23# autogen-native links against libguile which may have been relocated with sstate
24# these environment variables ensure there isn't a relocation issue
25export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0"
26export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache"
27
28do_install_append () {
29 create_wrapper ${D}/${bindir}/autogen \
30 GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
31 GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
32}
diff --git a/meta/recipes-devtools/autogen/autogen/guile.patch b/meta/recipes-devtools/autogen/autogen/guile.patch
new file mode 100644
index 0000000000..332e5aae50
--- /dev/null
+++ b/meta/recipes-devtools/autogen/autogen/guile.patch
@@ -0,0 +1,191 @@
1remove dpkg and guile-config
2
3Disable the autoconf macros that use dpkg (!) and guile-config to
4determine what version and where guile is installed, and just use
5pkg-config directly (guile-config is a deprecated wrapper around
6pkg-config).
7
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10Uprade to 5.18.2
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12Upstream-Status: Pending [should be submitted]
13---
14 config/ag_macros.m4 | 151 +++-------------------------------------------------
15 1 file changed, 8 insertions(+), 143 deletions(-)
16
17diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
18index c05073e..a8e96da 100644
19--- a/config/ag_macros.m4
20+++ b/config/ag_macros.m4
21@@ -180,118 +180,13 @@ return 0;],
22
23
24 AC_DEFUN([AG_WITHLIB_GUILE],[
25- AC_ARG_WITH([libguile],
26- AS_HELP_STRING([--with-libguile], [libguile installation prefix]),
27- [ag_cv_with_libguile_root=${with_libguile}],
28- AC_CACHE_CHECK([whether with-libguile was specified], ag_cv_with_libguile_root,
29- ag_cv_with_libguile_root=no)
30- ) # end of AC_ARG_WITH libguile
31-
32- if test "${with_libguile+set}" = set && \
33- test "X${withval}" = Xno
34- then ## disabled by request
35- ag_cv_with_libguile_root=no
36- ag_cv_with_libguile_cflags=no
37- ag_cv_with_libguile_libs=no
38- else
39+ PKG_PROG_PKG_CONFIG
40+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
41+ case "${LIBGUILE_LIBS}" in *-L* )
42+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
43+ ;; * ) LIBGUILE_PATH='' ;; esac
44
45- AC_ARG_WITH([libguile-cflags],
46- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]),
47- [ag_cv_with_libguile_cflags=${with_libguile_cflags}],
48- AC_CACHE_CHECK([whether with-libguile-cflags was specified], ag_cv_with_libguile_cflags,
49- ag_cv_with_libguile_cflags=no)
50- ) # end of AC_ARG_WITH libguile-cflags
51-
52- AC_ARG_WITH([libguile-libs],
53- AS_HELP_STRING([--with-libguile-libs], [libguile link command arguments]),
54- [ag_cv_with_libguile_libs=${with_libguile_libs}],
55- AC_CACHE_CHECK([whether with-libguile-libs was specified], ag_cv_with_libguile_libs,
56- ag_cv_with_libguile_libs=no)
57- ) # end of AC_ARG_WITH libguile-libs
58-
59- case "X${ag_cv_with_libguile_cflags}" in
60- Xyes|Xno|X )
61- case "X${ag_cv_with_libguile_root}" in
62- Xyes|Xno|X ) ag_cv_with_libguile_cflags=no ;;
63- * ) ag_cv_with_libguile_cflags=-I${ag_cv_with_libguile_root}/include ;;
64- esac
65- esac
66- case "X${ag_cv_with_libguile_libs}" in
67- Xyes|Xno|X )
68- case "X${ag_cv_with_libguile_root}" in
69- Xyes|Xno|X ) ag_cv_with_libguile_libs=no ;;
70- * ) ag_cv_with_libguile_libs="-L${ag_cv_with_libguile_root}/lib -lguile";;
71- esac
72- esac
73- ag_save_CPPFLAGS="${CPPFLAGS}"
74- ag_save_LIBS="${LIBS}"
75- case "X${ag_cv_with_libguile_cflags}" in
76- Xyes|Xno|X )
77- f=`guile-config compile 2>/dev/null` || f=''
78- test -n "${f}" && ag_cv_with_libguile_cflags="${f}" && \
79- AC_MSG_NOTICE([guile-config used for CFLAGS: $f]) ;;
80- esac
81- case "X${ag_cv_with_libguile_libs}" in
82- Xyes|Xno|X )
83- f=`guile-config link 2>/dev/null` || f=''
84- test -n "${f}" && ag_cv_with_libguile_libs="${f}" && \
85- AC_MSG_NOTICE([guile-config used for LIBS: $f]) ;;
86- esac
87- case "X${ag_cv_with_libguile_cflags}" in
88- Xyes|Xno|X )
89- ag_cv_with_libguile_cflags="" ;;
90- * ) CPPFLAGS="${CPPFLAGS} ${ag_cv_with_libguile_cflags}" ;;
91- esac
92- case "X${ag_cv_with_libguile_libs}" in
93- Xyes|Xno|X )
94- LIBS="${LIBS} -lguile"
95- ag_cv_with_libguile_libs="-lguile" ;;
96- * )
97- LIBS="${LIBS} ${ag_cv_with_libguile_libs}" ;;
98- esac
99- LIBGUILE_CFLAGS=""
100- LIBGUILE_LIBS=""
101- AC_MSG_CHECKING([whether libguile can be linked with])
102- AC_CACHE_VAL([ag_cv_with_libguile],[
103- AC_LINK_IFELSE(
104- [AC_LANG_SOURCE([[@%:@include <libguile.h>
105-@%:@if ((SCM_MAJOR_VERSION * 100) + SCM_MINOR_VERSION) > 200
106-This has not been tested with Guile 2.1. Remove this line to proceed.
107-@%:@endif
108-int main () {
109- SCM fumble = SCM_UNDEFINED;
110- SCM bumble = SCM_UNDEFINED;
111- SCM stumble= SCM_UNDEFINED;
112- long lstumble;
113- stumble = scm_display( fumble, bumble );
114- lstumble = scm_ilength( fumble );
115- stumble = scm_c_eval_string( "stumble" );
116- scm_misc_error( "oops", "bad", bumble );
117- stumble = scm_num_eq_p( fumble, bumble );
118- scm_wrong_type_arg( "oops", 1, bumble );
119- return 0; }]])],
120- [ag_cv_with_libguile=yes],
121- [ag_cv_with_libguile=no]) # end of AC_LINK_IFELSE
122- ]) # end of AC_CACHE_VAL for ag_cv_with_libguile
123- fi ## disabled by request
124- AC_MSG_RESULT([${ag_cv_with_libguile}])
125- AC_SUBST([LIBGUILE_CFLAGS])
126- AC_SUBST([LIBGUILE_LIBS])
127- if test "X${ag_cv_with_libguile}" != Xno
128- then[
129- LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}"
130- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"]
131- CPPFLAGS="@S|@{ag_save_CPPFLAGS}"
132- LIBS="@S|@{ag_save_LIBS}"
133- else
134- CPPFLAGS="${ag_save_CPPFLAGS}"
135- LIBS="${ag_save_LIBS}"
136- LIBGUILE_CFLAGS=''
137- LIBGUILE_LIBS=''
138- AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?])
139- fi
140 AC_SUBST([AG_GUILE])
141-
142 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE
143
144
145@@ -311,40 +206,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
146
147
148 AC_DEFUN([AG_TEST_GUILE_VERSION],[
149- AC_MSG_CHECKING([whether the guile version])
150+ PKG_PROG_PKG_CONFIG
151+ AC_MSG_CHECKING([the guile version])
152 AC_CACHE_VAL([ag_cv_test_guile_version],[
153- ag_cv_test_guile_version=`exec 2> /dev/null
154-v=\`guile-config --version 2>&1\`
155-test -n "${v}" && {
156- echo "${v}" | sed 's/.*Guile version *//'
157- exit 0
158-}
159-v=\`guile --version\`
160-test -n "${v}" && {
161- echo "${v}" | sed 's/.*Guile *//;1q'
162- exit 0
163-}
164-v=\`rpm -q --list guile-devel 2>/dev/null | \\
165- grep '/version\\.h' | \\
166- head -1\`
167-test -n "${v}" && {
168- v=\`awk '/^#define SCM_M/{print $2 "=" $3}' $v\`
169- eval "$v"
170- test "X$SCM_MICRO_VERSION" = X || \\
171- SCM_MINOR_VERSION=$SCM_MINOR_VERSION.$SCM_MICRO_VERSION
172- echo "$SCM_MAJOR_VERSION.$SCM_MINOR_VERSION"
173- exit 0
174-}
175-v=\`dpkg --list 2>/dev/null | egrep 'guile-[0-9.]*-dev' | head -1\`
176-test -n "${v}" && {
177- echo "${v}" | sed 's/.*guile-//;s/-dev.*//'
178- exit 0
179-}
180-exit 1`
181- if test $? -ne 0 || test -z "$ag_cv_test_guile_version"
182- then ag_cv_test_guile_version=no
183- fi
184- ]) # end of CACHE_VAL of ag_cv_test_guile_version
185+ ag_cv_test_guile_version=`exec $PKG_CONFIG --modversion guile-2.0`])
186 AC_MSG_RESULT([${ag_cv_test_guile_version}])
187 if test "X${ag_cv_test_guile_version}" != Xno
188 then
189--
1901.8.3.1
191
diff --git a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
new file mode 100644
index 0000000000..3d4c1d604e
--- /dev/null
+++ b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
@@ -0,0 +1,33 @@
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 0af7c18..5544f59 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -175,9 +175,9 @@ config_end_time=`date +%s 2>/dev/null`
19 time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null`
20
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 ]
31--
321.7.9.5
33
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 @@
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-30 13:07:32 +0000