Magellan Linux

Contents of /trunk/autogen/patches/autogen-5.18.16-guile-3.0.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3757 - (show annotations) (download)
Wed Aug 9 10:17:30 2023 UTC (9 months, 2 weeks ago) by niro
File size: 1763 byte(s)
-autogen patches
1 # Patch origin: https://sourceforge.net/p/autogen/bugs/196/#1a10
2
3 Index: autogen-5.18.16/agen5/guile-iface.h
4 ===================================================================
5 --- autogen-5.18.16.orig/agen5/guile-iface.h
6 +++ autogen-5.18.16/agen5/guile-iface.h
7 @@ -9,16 +9,13 @@
8 # error AutoGen does not work with this version of Guile
9 choke me.
10
11 -#elif GUILE_VERSION < 203000
12 +#else
13 # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
14 # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
15 # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
16 # define AG_SCM_TO_LONG(_v) scm_to_long(_v)
17 # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
18
19 -#else
20 -# error unknown GUILE_VERSION
21 - choke me.
22 #endif
23
24 #endif /* MUTATING_GUILE_IFACE_H_GUARD */
25 Index: autogen-5.18.16/configure
26 ===================================================================
27 --- autogen-5.18.16.orig/configure
28 +++ autogen-5.18.16/configure
29 @@ -14798,7 +14798,7 @@ $as_echo "no" >&6; }
30 PKG_CONFIG=""
31 fi
32 fi
33 - _guile_versions_to_search="2.2 2.0 1.8"
34 + _guile_versions_to_search="3.0 2.2 2.0 1.8"
35 if test -n "$GUILE_EFFECTIVE_VERSION"; then
36 _guile_tmp=""
37 for v in $_guile_versions_to_search; do
38 Index: autogen-5.18.16/config/guile.m4
39 ===================================================================
40 --- autogen-5.18.16.orig/config/guile.m4
41 +++ autogen-5.18.16/config/guile.m4
42 @@ -61,7 +61,7 @@
43 #
44 AC_DEFUN([GUILE_PKG],
45 [PKG_PROG_PKG_CONFIG
46 - _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
47 + _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
48 if test -n "$GUILE_EFFECTIVE_VERSION"; then
49 _guile_tmp=""
50 for v in $_guile_versions_to_search; do