autogen-native: upgrade to 5.18.2
* Upgrade from 5.17.4 to 5.18.2 * Rename files -> autogen (From OE-Core rev: 6bcd2dafa379badab11bff9d7b607f7f5d72fc94) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
484727e25f
commit
0cfb1e7a9f
|
@ -12,8 +12,8 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
|
||||||
file://guile.patch \
|
file://guile.patch \
|
||||||
file://increase-timeout-limit.patch"
|
file://increase-timeout-limit.patch"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90"
|
SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4"
|
||||||
SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed"
|
SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068"
|
||||||
|
|
||||||
DEPENDS = "guile-native libtool-native libxml2-native"
|
DEPENDS = "guile-native libtool-native libxml2-native"
|
||||||
|
|
|
@ -1,14 +1,24 @@
|
||||||
Disable the autoconf macros that use dpkg (!) and guile-config to determine what
|
remove dpkg and guile-config
|
||||||
version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config).
|
|
||||||
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
Disable the autoconf macros that use dpkg (!) and guile-config to
|
||||||
Upstream-Status: Pending (should be submitted)
|
determine what version and where guile is installed, and just use
|
||||||
|
pkg-config directly (guile-config is a deprecated wrapper around
|
||||||
|
pkg-config).
|
||||||
|
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
Uprade to 5.18.2
|
||||||
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
Upstream-Status: Pending [should be submitted]
|
||||||
|
---
|
||||||
|
config/ag_macros.m4 | 151 +++-------------------------------------------------
|
||||||
|
1 file changed, 8 insertions(+), 143 deletions(-)
|
||||||
|
|
||||||
diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
|
diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
|
||||||
index 9914a65..b6db97a 100644
|
index c05073e..a8e96da 100644
|
||||||
--- a/config/ag_macros.m4
|
--- a/config/ag_macros.m4
|
||||||
+++ b/config/ag_macros.m4
|
+++ b/config/ag_macros.m4
|
||||||
@@ -175,123 +175,12 @@ return 0;],
|
@@ -180,118 +180,13 @@ return 0;],
|
||||||
|
|
||||||
|
|
||||||
AC_DEFUN([AG_WITHLIB_GUILE],[
|
AC_DEFUN([AG_WITHLIB_GUILE],[
|
||||||
|
@ -26,7 +36,12 @@ index 9914a65..b6db97a 100644
|
||||||
- ag_cv_with_libguile_cflags=no
|
- ag_cv_with_libguile_cflags=no
|
||||||
- ag_cv_with_libguile_libs=no
|
- ag_cv_with_libguile_libs=no
|
||||||
- else
|
- else
|
||||||
-
|
+ PKG_PROG_PKG_CONFIG
|
||||||
|
+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
|
||||||
|
+ case "${LIBGUILE_LIBS}" in *-L* )
|
||||||
|
+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
|
||||||
|
+ ;; * ) LIBGUILE_PATH='' ;; esac
|
||||||
|
|
||||||
- AC_ARG_WITH([libguile-cflags],
|
- AC_ARG_WITH([libguile-cflags],
|
||||||
- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]),
|
- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]),
|
||||||
- [ag_cv_with_libguile_cflags=${with_libguile_cflags}],
|
- [ag_cv_with_libguile_cflags=${with_libguile_cflags}],
|
||||||
|
@ -109,14 +124,10 @@ index 9914a65..b6db97a 100644
|
||||||
- AC_MSG_RESULT([${ag_cv_with_libguile}])
|
- AC_MSG_RESULT([${ag_cv_with_libguile}])
|
||||||
- AC_SUBST([LIBGUILE_CFLAGS])
|
- AC_SUBST([LIBGUILE_CFLAGS])
|
||||||
- AC_SUBST([LIBGUILE_LIBS])
|
- AC_SUBST([LIBGUILE_LIBS])
|
||||||
- AC_SUBST([LIBGUILE_PATH])
|
|
||||||
- if test "X${ag_cv_with_libguile}" != Xno
|
- if test "X${ag_cv_with_libguile}" != Xno
|
||||||
- then[
|
- then[
|
||||||
- LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}"
|
- LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}"
|
||||||
- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"
|
- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"]
|
||||||
- case "${LIBGUILE_LIBS}" in *-L* )
|
|
||||||
- LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
|
|
||||||
- ;; * ) LIBGUILE_PATH='' ;; esac]
|
|
||||||
- CPPFLAGS="@S|@{ag_save_CPPFLAGS}"
|
- CPPFLAGS="@S|@{ag_save_CPPFLAGS}"
|
||||||
- LIBS="@S|@{ag_save_LIBS}"
|
- LIBS="@S|@{ag_save_LIBS}"
|
||||||
- else
|
- else
|
||||||
|
@ -124,20 +135,14 @@ index 9914a65..b6db97a 100644
|
||||||
- LIBS="${ag_save_LIBS}"
|
- LIBS="${ag_save_LIBS}"
|
||||||
- LIBGUILE_CFLAGS=''
|
- LIBGUILE_CFLAGS=''
|
||||||
- LIBGUILE_LIBS=''
|
- LIBGUILE_LIBS=''
|
||||||
- LIBGUILE_PATH=''
|
|
||||||
- AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?])
|
- AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?])
|
||||||
- fi
|
- fi
|
||||||
+ PKG_PROG_PKG_CONFIG
|
|
||||||
+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
|
|
||||||
+ case "${LIBGUILE_LIBS}" in *-L* )
|
|
||||||
+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
|
|
||||||
+ ;; * ) LIBGUILE_PATH='' ;; esac
|
|
||||||
AC_SUBST([AG_GUILE])
|
AC_SUBST([AG_GUILE])
|
||||||
-
|
-
|
||||||
]) # end of AC_DEFUN of AG_WITHLIB_GUILE
|
]) # end of AC_DEFUN of AG_WITHLIB_GUILE
|
||||||
|
|
||||||
|
|
||||||
@@ -311,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
|
@@ -311,40 +206,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
|
||||||
|
|
||||||
|
|
||||||
AC_DEFUN([AG_TEST_GUILE_VERSION],[
|
AC_DEFUN([AG_TEST_GUILE_VERSION],[
|
||||||
|
@ -181,3 +186,6 @@ index 9914a65..b6db97a 100644
|
||||||
AC_MSG_RESULT([${ag_cv_test_guile_version}])
|
AC_MSG_RESULT([${ag_cv_test_guile_version}])
|
||||||
if test "X${ag_cv_test_guile_version}" != Xno
|
if test "X${ag_cv_test_guile_version}" != Xno
|
||||||
then
|
then
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
Loading…
Reference in New Issue