summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/autogen/autogen-native_5.18.2.bb (renamed from meta/recipes-devtools/autogen/autogen-native_5.17.4.bb)6
-rw-r--r--meta/recipes-devtools/autogen/autogen/guile.patch (renamed from meta/recipes-devtools/autogen/files/guile.patch)48
-rw-r--r--meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch (renamed from meta/recipes-devtools/autogen/files/increase-timeout-limit.patch)0
3 files changed, 31 insertions, 23 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
index 28d82b0912..c7950c3c6a 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
@@ -6,14 +6,14 @@ DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\
6HOMEPAGE = "http://www.gnu.org/software/autogen/" 6HOMEPAGE = "http://www.gnu.org/software/autogen/"
7SECTION = "devel" 7SECTION = "devel"
8LICENSE = "GPLv3" 8LICENSE = "GPLv3"
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10 10
11SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
12 file://guile.patch \ 12 file://guile.patch \
13 file://increase-timeout-limit.patch" 13 file://increase-timeout-limit.patch"
14 14
15SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90" 15SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4"
16SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed" 16SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068"
17 17
18DEPENDS = "guile-native libtool-native libxml2-native" 18DEPENDS = "guile-native libtool-native libxml2-native"
19 19
diff --git a/meta/recipes-devtools/autogen/files/guile.patch b/meta/recipes-devtools/autogen/autogen/guile.patch
index 8a77dba01e..332e5aae50 100644
--- a/meta/recipes-devtools/autogen/files/guile.patch
+++ b/meta/recipes-devtools/autogen/autogen/guile.patch
@@ -1,14 +1,24 @@
1Disable the autoconf macros that use dpkg (!) and guile-config to determine what 1remove dpkg and guile-config
2version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). 2
3 3Disable the autoconf macros that use dpkg (!) and guile-config to
4 Signed-off-by: Ross Burton <ross.burton@intel.com> 4determine what version and where guile is installed, and just use
5 Upstream-Status: Pending (should be submitted) 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(-)
6 16
7diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 17diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
8index 9914a65..b6db97a 100644 18index c05073e..a8e96da 100644
9--- a/config/ag_macros.m4 19--- a/config/ag_macros.m4
10+++ b/config/ag_macros.m4 20+++ b/config/ag_macros.m4
11@@ -175,123 +175,12 @@ return 0;], 21@@ -180,118 +180,13 @@ return 0;],
12 22
13 23
14 AC_DEFUN([AG_WITHLIB_GUILE],[ 24 AC_DEFUN([AG_WITHLIB_GUILE],[
@@ -26,7 +36,12 @@ index 9914a65..b6db97a 100644
26- ag_cv_with_libguile_cflags=no 36- ag_cv_with_libguile_cflags=no
27- ag_cv_with_libguile_libs=no 37- ag_cv_with_libguile_libs=no
28- else 38- else
29- 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
30- AC_ARG_WITH([libguile-cflags], 45- AC_ARG_WITH([libguile-cflags],
31- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]), 46- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]),
32- [ag_cv_with_libguile_cflags=${with_libguile_cflags}], 47- [ag_cv_with_libguile_cflags=${with_libguile_cflags}],
@@ -109,14 +124,10 @@ index 9914a65..b6db97a 100644
109- AC_MSG_RESULT([${ag_cv_with_libguile}]) 124- AC_MSG_RESULT([${ag_cv_with_libguile}])
110- AC_SUBST([LIBGUILE_CFLAGS]) 125- AC_SUBST([LIBGUILE_CFLAGS])
111- AC_SUBST([LIBGUILE_LIBS]) 126- AC_SUBST([LIBGUILE_LIBS])
112- AC_SUBST([LIBGUILE_PATH])
113- if test "X${ag_cv_with_libguile}" != Xno 127- if test "X${ag_cv_with_libguile}" != Xno
114- then[ 128- then[
115- LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}" 129- LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}"
116- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}" 130- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"]
117- case "${LIBGUILE_LIBS}" in *-L* )
118- LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
119- ;; * ) LIBGUILE_PATH='' ;; esac]
120- CPPFLAGS="@S|@{ag_save_CPPFLAGS}" 131- CPPFLAGS="@S|@{ag_save_CPPFLAGS}"
121- LIBS="@S|@{ag_save_LIBS}" 132- LIBS="@S|@{ag_save_LIBS}"
122- else 133- else
@@ -124,20 +135,14 @@ index 9914a65..b6db97a 100644
124- LIBS="${ag_save_LIBS}" 135- LIBS="${ag_save_LIBS}"
125- LIBGUILE_CFLAGS='' 136- LIBGUILE_CFLAGS=''
126- LIBGUILE_LIBS='' 137- LIBGUILE_LIBS=''
127- LIBGUILE_PATH=''
128- AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?]) 138- AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?])
129- fi 139- fi
130+ PKG_PROG_PKG_CONFIG
131+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
132+ case "${LIBGUILE_LIBS}" in *-L* )
133+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
134+ ;; * ) LIBGUILE_PATH='' ;; esac
135 AC_SUBST([AG_GUILE]) 140 AC_SUBST([AG_GUILE])
136- 141-
137 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE 142 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE
138 143
139 144
140@@ -311,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[ 145@@ -311,40 +206,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
141 146
142 147
143 AC_DEFUN([AG_TEST_GUILE_VERSION],[ 148 AC_DEFUN([AG_TEST_GUILE_VERSION],[
@@ -181,3 +186,6 @@ index 9914a65..b6db97a 100644
181 AC_MSG_RESULT([${ag_cv_test_guile_version}]) 186 AC_MSG_RESULT([${ag_cv_test_guile_version}])
182 if test "X${ag_cv_test_guile_version}" != Xno 187 if test "X${ag_cv_test_guile_version}" != Xno
183 then 188 then
189--
1901.8.3.1
191
diff --git a/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
index 3d4c1d604e..3d4c1d604e 100644
--- a/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch
+++ b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch