summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/autogen/autogen/guile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/autogen/autogen/guile.patch')
-rw-r--r--meta/recipes-devtools/autogen/autogen/guile.patch191
1 files changed, 191 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autogen/autogen/guile.patch b/meta/recipes-devtools/autogen/autogen/guile.patch
new file mode 100644
index 0000000..332e5aa
--- /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