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.17.4.bb (renamed from meta/recipes-devtools/autogen/autogen-native_5.17.3.bb)4
-rw-r--r--meta/recipes-devtools/autogen/files/guile.patch19
2 files changed, 11 insertions, 12 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb b/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb
index b1019666cf..e5234c2909 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
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 13
14SRC_URI[md5sum] = "2d14ced1c28f71e61bb7c58e93317a40" 14SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90"
15SRC_URI[sha256sum] = "2f795c224fac899ec3a801a9a32aad2a8104fe926dcc1994cc0797f9a3f4e97d" 15SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed"
16 16
17DEPENDS = "guile-native libtool-native libxml2-native" 17DEPENDS = "guile-native libtool-native libxml2-native"
18RDEPENDS = "automake pkgconfig" 18RDEPENDS = "automake pkgconfig"
diff --git a/meta/recipes-devtools/autogen/files/guile.patch b/meta/recipes-devtools/autogen/files/guile.patch
index 09b441b1da..8a77dba01e 100644
--- a/meta/recipes-devtools/autogen/files/guile.patch
+++ b/meta/recipes-devtools/autogen/files/guile.patch
@@ -1,14 +1,14 @@
1Disable the autoconf macros that use dpkg (!) and guile-config to determine what 1Disable the autoconf macros that use dpkg (!) and guile-config to determine what
2version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). 2version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config).
3 3
4Signed-off-by: Ross Burton <ross.burton@intel.com> 4 Signed-off-by: Ross Burton <ross.burton@intel.com>
5Upstream-Status: Pending (should be submitted) 5 Upstream-Status: Pending (should be submitted)
6 6
7diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 7diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
8index c69b11c..915968b 100644 8index 9914a65..b6db97a 100644
9--- a/config/ag_macros.m4 9--- a/config/ag_macros.m4
10+++ b/config/ag_macros.m4 10+++ b/config/ag_macros.m4
11@@ -175,124 +175,12 @@ return 0;], 11@@ -175,123 +175,12 @@ return 0;],
12 12
13 13
14 AC_DEFUN([AG_WITHLIB_GUILE],[ 14 AC_DEFUN([AG_WITHLIB_GUILE],[
@@ -69,8 +69,6 @@ index c69b11c..915968b 100644
69- test -n "${f}" && ag_cv_with_libguile_libs="${f}" && \ 69- test -n "${f}" && ag_cv_with_libguile_libs="${f}" && \
70- AC_MSG_NOTICE([guile-config used for LIBS: $f]) ;; 70- AC_MSG_NOTICE([guile-config used for LIBS: $f]) ;;
71- esac 71- esac
72- fi ## disabled by request
73-
74- case "X${ag_cv_with_libguile_cflags}" in 72- case "X${ag_cv_with_libguile_cflags}" in
75- Xyes|Xno|X ) 73- Xyes|Xno|X )
76- ag_cv_with_libguile_cflags="" ;; 74- ag_cv_with_libguile_cflags="" ;;
@@ -107,6 +105,7 @@ index c69b11c..915968b 100644
107- [ag_cv_with_libguile=yes], 105- [ag_cv_with_libguile=yes],
108- [ag_cv_with_libguile=no]) # end of AC_LINK_IFELSE 106- [ag_cv_with_libguile=no]) # end of AC_LINK_IFELSE
109- ]) # end of AC_CACHE_VAL for ag_cv_with_libguile 107- ]) # end of AC_CACHE_VAL for ag_cv_with_libguile
108- fi ## disabled by request
110- AC_MSG_RESULT([${ag_cv_with_libguile}]) 109- AC_MSG_RESULT([${ag_cv_with_libguile}])
111- AC_SUBST([LIBGUILE_CFLAGS]) 110- AC_SUBST([LIBGUILE_CFLAGS])
112- AC_SUBST([LIBGUILE_LIBS]) 111- AC_SUBST([LIBGUILE_LIBS])
@@ -138,7 +137,7 @@ index c69b11c..915968b 100644
138 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE 137 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE
139 138
140 139
141@@ -312,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[ 140@@ -311,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
142 141
143 142
144 AC_DEFUN([AG_TEST_GUILE_VERSION],[ 143 AC_DEFUN([AG_TEST_GUILE_VERSION],[