| 1 |
commit: 43bcc61c56a5a7de0eaf806efec7d8c0e4c01ae7 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 19 08:45:00 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 19 08:45:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bcc61c |
| 7 |
|
| 8 |
sys-devel/autogen: add minimal guile-3 support |
| 9 |
|
| 10 |
Reported-by: Cedric Sodhi |
| 11 |
Closes: https://bugs.gentoo.org/746917 |
| 12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-devel/autogen/autogen-5.18.16-r1.ebuild | 1 + |
| 16 |
.../autogen/files/autogen-5.18.16-guile-3.patch | 38 ++++++++++++++++++++++ |
| 17 |
2 files changed, 39 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild |
| 20 |
index 580f8317fbc..748c7fec6d4 100644 |
| 21 |
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild |
| 22 |
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild |
| 23 |
@@ -24,6 +24,7 @@ PATCHES=( |
| 24 |
"${FILESDIR}"/${PN}-5.18.16-rpath.patch |
| 25 |
"${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch |
| 26 |
"${FILESDIR}"/${PN}-5.18.16-make-4.3.patch |
| 27 |
+ "${FILESDIR}"/${PN}-5.18.16-guile-3.patch |
| 28 |
) |
| 29 |
|
| 30 |
src_prepare() { |
| 31 |
|
| 32 |
diff --git a/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch b/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..2d21c4fae3e |
| 35 |
--- /dev/null |
| 36 |
+++ b/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch |
| 37 |
@@ -0,0 +1,38 @@ |
| 38 |
+--- a/config/guile.m4 |
| 39 |
++++ b/config/guile.m4 |
| 40 |
+@@ -61,7 +61,7 @@ |
| 41 |
+ # |
| 42 |
+ AC_DEFUN([GUILE_PKG], |
| 43 |
+ [PKG_PROG_PKG_CONFIG |
| 44 |
+- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" |
| 45 |
++ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])" |
| 46 |
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then |
| 47 |
+ _guile_tmp="" |
| 48 |
+ for v in $_guile_versions_to_search; do |
| 49 |
+--- a/configure |
| 50 |
++++ b/configure |
| 51 |
+@@ -14799,7 +14799,7 @@ $as_echo "no" >&6; } |
| 52 |
+ PKG_CONFIG="" |
| 53 |
+ fi |
| 54 |
+ fi |
| 55 |
+- _guile_versions_to_search="2.2 2.0 1.8" |
| 56 |
++ _guile_versions_to_search="3.0 2.2 2.0 1.8" |
| 57 |
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then |
| 58 |
+ _guile_tmp="" |
| 59 |
+ for v in $_guile_versions_to_search; do |
| 60 |
+--- a/agen5/guile-iface.h |
| 61 |
++++ b/agen5/guile-iface.h |
| 62 |
+@@ -16,6 +16,13 @@ |
| 63 |
+ # define AG_SCM_TO_LONG(_v) scm_to_long(_v) |
| 64 |
+ # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) |
| 65 |
+ |
| 66 |
++#elif GUILE_VERSION < 400000 |
| 67 |
++# define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) |
| 68 |
++# define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) |
| 69 |
++# define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) |
| 70 |
++# define AG_SCM_TO_LONG(_v) scm_to_long(_v) |
| 71 |
++# define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) |
| 72 |
++ |
| 73 |
+ #else |
| 74 |
+ # error unknown GUILE_VERSION |
| 75 |
+ choke me. |
Archives