diff options
author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-05-27 15:14:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-29 22:07:54 +0100 |
commit | 493556b4dfb1e16d117dfd71209a7cde106cbddf (patch) | |
tree | 9290c3914e7ae2a740cf2b5a129a4636c9d5504a /meta/recipes-devtools/autogen/files | |
parent | 5fa3649113b178266bc59a3a58d961ab4a6b41ad (diff) | |
download | poky-493556b4dfb1e16d117dfd71209a7cde106cbddf.tar.gz |
autogen-native: upgraded to 5.17.4
(From OE-Core rev: 849d98a45b3f21f55bfecdd9daf494a632d53a48)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/autogen/files')
-rw-r--r-- | meta/recipes-devtools/autogen/files/guile.patch | 19 |
1 files changed, 9 insertions, 10 deletions
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 @@ | |||
1 | Disable the autoconf macros that use dpkg (!) and guile-config to determine what | 1 | Disable the autoconf macros that use dpkg (!) and guile-config to determine what |
2 | version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). | 2 | version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). |
3 | 3 | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
5 | Upstream-Status: Pending (should be submitted) | 5 | Upstream-Status: Pending (should be submitted) |
6 | 6 | ||
7 | diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 | 7 | diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 |
8 | index c69b11c..915968b 100644 | 8 | index 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],[ |