summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/autogen/autogen-native_5.17.3.bb (renamed from meta/recipes-devtools/autogen/autogen-native_5.12.bb)6
-rw-r--r--meta/recipes-devtools/autogen/files/guile.patch79
2 files changed, 45 insertions, 40 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb
index d13af08e99..b1019666cf 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.12.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb
@@ -11,10 +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] = "6c6671b76021fb30dd43b0d5fdb7180b" 14SRC_URI[md5sum] = "2d14ced1c28f71e61bb7c58e93317a40"
15SRC_URI[sha256sum] = "37e885d6c8a58f33ab198d38bb972fa4c14236f951d628161dde6e20527d0df2" 15SRC_URI[sha256sum] = "2f795c224fac899ec3a801a9a32aad2a8104fe926dcc1994cc0797f9a3f4e97d"
16
17PR = "r3"
18 16
19DEPENDS = "guile-native libtool-native libxml2-native" 17DEPENDS = "guile-native libtool-native libxml2-native"
20RDEPENDS = "automake pkgconfig" 18RDEPENDS = "automake pkgconfig"
diff --git a/meta/recipes-devtools/autogen/files/guile.patch b/meta/recipes-devtools/autogen/files/guile.patch
index f485bba325..09b441b1da 100644
--- a/meta/recipes-devtools/autogen/files/guile.patch
+++ b/meta/recipes-devtools/autogen/files/guile.patch
@@ -4,11 +4,11 @@ version and where guile is installed, and just use pkg-config directly (guile-co
4Signed-off-by: Ross Burton <ross.burton@intel.com> 4Signed-off-by: Ross Burton <ross.burton@intel.com>
5Upstream-Status: Pending (should be submitted) 5Upstream-Status: Pending (should be submitted)
6 6
7Index: a/config/ag_macros.m4 7diff --git a/config/ag_macros.m4 b/config/ag_macros.m4
8=================================================================== 8index c69b11c..915968b 100644
9--- a/config/ag_macros.m4 2012-11-27 14:53:24.336205621 +0000 9--- a/config/ag_macros.m4
10+++ b/config/ag_macros.m4 2012-11-27 16:16:42.968271120 +0000 10+++ b/config/ag_macros.m4
11@@ -163,146 +162,20 @@ 11@@ -175,124 +175,12 @@ return 0;],
12 12
13 13
14 AC_DEFUN([AG_WITHLIB_GUILE],[ 14 AC_DEFUN([AG_WITHLIB_GUILE],[
@@ -20,7 +20,7 @@ Index: a/config/ag_macros.m4
20- ) # end of AC_ARG_WITH libguile 20- ) # end of AC_ARG_WITH libguile
21- 21-
22- if test "${with_libguile+set}" = set && \ 22- if test "${with_libguile+set}" = set && \
23- test "${withval}" = no 23- test "X${withval}" = Xno
24- then ## disabled by request 24- then ## disabled by request
25- ag_cv_with_libguile_root=no 25- ag_cv_with_libguile_root=no
26- ag_cv_with_libguile_cflags=no 26- ag_cv_with_libguile_cflags=no
@@ -29,14 +29,14 @@ Index: a/config/ag_macros.m4
29- 29-
30- AC_ARG_WITH([libguile-cflags], 30- AC_ARG_WITH([libguile-cflags],
31- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]), 31- AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]),
32- [ag_cv_with_libguile_cflags=${with_guile_cflags}], 32- [ag_cv_with_libguile_cflags=${with_libguile_cflags}],
33- AC_CACHE_CHECK([whether with-libguile-cflags was specified], ag_cv_with_libguile_cflags, 33- AC_CACHE_CHECK([whether with-libguile-cflags was specified], ag_cv_with_libguile_cflags,
34- ag_cv_with_libguile_cflags=no) 34- ag_cv_with_libguile_cflags=no)
35- ) # end of AC_ARG_WITH libguile-cflags 35- ) # end of AC_ARG_WITH libguile-cflags
36- 36-
37- AC_ARG_WITH([libguile-libs], 37- AC_ARG_WITH([libguile-libs],
38- AS_HELP_STRING([--with-libguile-libs], [libguile link command arguments]), 38- AS_HELP_STRING([--with-libguile-libs], [libguile link command arguments]),
39- [ag_cv_with_libguile_libs=${with_guile_libs}], 39- [ag_cv_with_libguile_libs=${with_libguile_libs}],
40- AC_CACHE_CHECK([whether with-libguile-libs was specified], ag_cv_with_libguile_libs, 40- AC_CACHE_CHECK([whether with-libguile-libs was specified], ag_cv_with_libguile_libs,
41- ag_cv_with_libguile_libs=no) 41- ag_cv_with_libguile_libs=no)
42- ) # end of AC_ARG_WITH libguile-libs 42- ) # end of AC_ARG_WITH libguile-libs
@@ -97,10 +97,8 @@ Index: a/config/ag_macros.m4
97- SCM bumble = SCM_UNDEFINED; 97- SCM bumble = SCM_UNDEFINED;
98- SCM stumble= SCM_UNDEFINED; 98- SCM stumble= SCM_UNDEFINED;
99- long lstumble; 99- long lstumble;
100- stumble = scm_cons( fumble, bumble );
101- stumble = scm_display( fumble, bumble ); 100- stumble = scm_display( fumble, bumble );
102- lstumble = scm_ilength( fumble ); 101- lstumble = scm_ilength( fumble );
103- /* stumble = scm_c_make_string( 1, SCM_UNDEFINED); */
104- stumble = scm_c_eval_string( "stumble" ); 102- stumble = scm_c_eval_string( "stumble" );
105- scm_misc_error( "oops", "bad", bumble ); 103- scm_misc_error( "oops", "bad", bumble );
106- stumble = scm_num_eq_p( fumble, bumble ); 104- stumble = scm_num_eq_p( fumble, bumble );
@@ -120,41 +118,62 @@ Index: a/config/ag_macros.m4
120- case "${LIBGUILE_LIBS}" in *-L* ) 118- case "${LIBGUILE_LIBS}" in *-L* )
121- LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'` 119- LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
122- ;; * ) LIBGUILE_PATH='' ;; esac] 120- ;; * ) LIBGUILE_PATH='' ;; esac]
123- CPPFLAGS="@S|@{ag_save_CPPFLAGS}" 121- CPPFLAGS="@S|@{ag_save_CPPFLAGS}"
124- LIBS="@S|@{ag_save_LIBS}" 122- LIBS="@S|@{ag_save_LIBS}"
125- else 123- else
126- CPPFLAGS="${ag_save_CPPFLAGS}" 124- CPPFLAGS="${ag_save_CPPFLAGS}"
127- LIBS="${ag_save_LIBS}" 125- LIBS="${ag_save_LIBS}"
128- LIBGUILE_CFLAGS='' 126- LIBGUILE_CFLAGS=''
129- LIBGUILE_LIBS='' 127- LIBGUILE_LIBS=''
130- LIBGUILE_PATH='' 128- LIBGUILE_PATH=''
131- AC_MSG_ERROR([Cannot find libguile. libguile is required.]) 129- AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?])
132- fi 130- fi
133+ PKG_PROG_PKG_CONFIG 131+ PKG_PROG_PKG_CONFIG
134+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0]) 132+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
135+ case "${LIBGUILE_LIBS}" in *-L* ) 133+ case "${LIBGUILE_LIBS}" in *-L* )
136+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'` 134+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'`
137+ ;; * ) LIBGUILE_PATH='' ;; esac 135+ ;; * ) LIBGUILE_PATH='' ;; esac
138 AC_SUBST([AG_GUILE]) 136 AC_SUBST([AG_GUILE])
139- 137-
140 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE 138 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE
141 139
142 140
141@@ -312,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[
142
143
143 AC_DEFUN([AG_TEST_GUILE_VERSION],[ 144 AC_DEFUN([AG_TEST_GUILE_VERSION],[
144- AC_MSG_CHECKING([whether the guile version]) 145- AC_MSG_CHECKING([whether the guile version])
145+ PKG_PROG_PKG_CONFIG 146+ PKG_PROG_PKG_CONFIG
146+ AC_MSG_CHECKING([the guile version]) 147+ AC_MSG_CHECKING([the guile version])
147 AC_CACHE_VAL([ag_cv_test_guile_version],[ 148 AC_CACHE_VAL([ag_cv_test_guile_version],[
148- ag_cv_test_guile_version=`exec 2> /dev/null 149- ag_cv_test_guile_version=`exec 2> /dev/null
149-pkginfo=\`dpkg --list 2>/dev/null | egrep 'guile-[0-9.]-dev'\` 150-v=\`guile-config --version 2>&1\`
150-if test -n "${pkginfo}" 151-test -n "${v}" && {
151-then echo ${pkginfo} | sed -e 's/.*guile-//' -e 's/-dev.*//' 152- echo "${v}" | sed 's/.*Guile version *//'
152-else 153- exit 0
153- v=\`( guile-config --version 2>&1 ) | sed 's/.*Guile version *//'\` 154-}
154- test -z "${v}" && v=\`guile --version | sed 's/.*Guile *//;1q'\` 155-v=\`guile --version\`
155- test -z "${v}" && exit 1 156-test -n "${v}" && {
156- echo ${v} 157- echo "${v}" | sed 's/.*Guile *//;1q'
157-fi` 158- exit 0
159-}
160-v=\`rpm -q --list guile-devel 2>/dev/null | \\
161- grep '/version\\.h' | \\
162- head -1\`
163-test -n "${v}" && {
164- v=\`awk '/^#define SCM_M/{print $2 "=" $3}' $v\`
165- eval "$v"
166- test "X$SCM_MICRO_VERSION" = X || \\
167- SCM_MINOR_VERSION=$SCM_MINOR_VERSION.$SCM_MICRO_VERSION
168- echo "$SCM_MAJOR_VERSION.$SCM_MINOR_VERSION"
169- exit 0
170-}
171-v=\`dpkg --list 2>/dev/null | egrep 'guile-[0-9.]*-dev' | head -1\`
172-test -n "${v}" && {
173- echo "${v}" | sed 's/.*guile-//;s/-dev.*//'
174- exit 0
175-}
176-exit 1`
158- if test $? -ne 0 || test -z "$ag_cv_test_guile_version" 177- if test $? -ne 0 || test -z "$ag_cv_test_guile_version"
159- then ag_cv_test_guile_version=no 178- then ag_cv_test_guile_version=no
160- fi 179- fi
@@ -163,15 +182,3 @@ Index: a/config/ag_macros.m4
163 AC_MSG_RESULT([${ag_cv_test_guile_version}]) 182 AC_MSG_RESULT([${ag_cv_test_guile_version}])
164 if test "X${ag_cv_test_guile_version}" != Xno 183 if test "X${ag_cv_test_guile_version}" != Xno
165 then 184 then
166@@ -324,9 +197,9 @@
167 AC_MSG_CHECKING([whether scm_primitive_eval_x links])
168 AC_CACHE_VAL([ag_cv_link_eval_string],[
169 ag_save_CPPFLAGS="${CPPFLAGS}"
170- CPPFLAGS="${ag_cv_with_libguile_cflags} ${CPPFLAGS}"
171+ CPPFLAGS="${LIBGUILE_CFLAGS} ${CPPFLAGS}"
172 ag_save_LIBS="${LIBS}"
173- LIBS="${ag_cv_with_libguile_libs} ${LIBS}"
174+ LIBS="${LIBGUILE_LIBS} ${LIBS}"
175 AC_TRY_LINK([@%:@include <libguile.h>],
176 [SCM res = scm_primitive_eval_x( SCM_UNDEFINED );],
177 [ag_cv_link_eval_string=yes],[ag_cv_link_eval_string=no]