| 1 |
commit: 2b5e4127a29101caf452f81263532016764a264f |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 4 14:50:48 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 14:51:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5e4127 |
| 7 |
|
| 8 |
sys-devel/autogen: Fixed build with =dev-scheme/guile-2.2* |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-devel/autogen/autogen-5.18.12.ebuild | 10 ++++++-- |
| 13 |
sys-devel/autogen/files/autogen-guile-2.2.patch | 34 +++++++++++++++++++++++++ |
| 14 |
2 files changed, 42 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild b/sys-devel/autogen/autogen-5.18.12.ebuild |
| 17 |
index 9d29603d3e7..65274d31baa 100644 |
| 18 |
--- a/sys-devel/autogen/autogen-5.18.12.ebuild |
| 19 |
+++ b/sys-devel/autogen/autogen-5.18.12.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
# Copyright 1999-2017 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="5" |
| 25 |
+EAPI=6 |
| 26 |
|
| 27 |
-inherit eutils toolchain-funcs |
| 28 |
+inherit ltprune toolchain-funcs |
| 29 |
|
| 30 |
DESCRIPTION="Program and text file generation" |
| 31 |
HOMEPAGE="https://www.gnu.org/software/autogen/" |
| 32 |
@@ -20,7 +20,13 @@ RDEPEND=">=dev-scheme/guile-2.0:= |
| 33 |
dev-libs/libxml2" |
| 34 |
DEPEND="${RDEPEND}" |
| 35 |
|
| 36 |
+PATCHES=( |
| 37 |
+ "${FILESDIR}/${PN}-guile-2.2.patch" |
| 38 |
+) |
| 39 |
+ |
| 40 |
src_prepare() { |
| 41 |
+ default |
| 42 |
+ |
| 43 |
# https://savannah.gnu.org/support/index.php?109050 |
| 44 |
sed -i \ |
| 45 |
-e "/--cflags-only-I/s:pkg-config:$(tc-getPKG_CONFIG):" \ |
| 46 |
|
| 47 |
diff --git a/sys-devel/autogen/files/autogen-guile-2.2.patch b/sys-devel/autogen/files/autogen-guile-2.2.patch |
| 48 |
new file mode 100644 |
| 49 |
index 00000000000..8ef904adb02 |
| 50 |
--- /dev/null |
| 51 |
+++ b/sys-devel/autogen/files/autogen-guile-2.2.patch |
| 52 |
@@ -0,0 +1,34 @@ |
| 53 |
+https://raw.githubusercontent.com/Homebrew/formula-patches/master/autogen/allow-guile-2.2.diff |
| 54 |
+ |
| 55 |
+--- a/agen5/guile-iface.h |
| 56 |
++++ b/agen5/guile-iface.h |
| 57 |
+@@ -9,7 +9,7 @@ |
| 58 |
+ # error AutoGen does not work with this version of Guile |
| 59 |
+ choke me. |
| 60 |
+ |
| 61 |
+-#elif GUILE_VERSION < 201000 |
| 62 |
++#else |
| 63 |
+ # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) |
| 64 |
+ # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) |
| 65 |
+ # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) |
| 66 |
+@@ -24,9 +24,6 @@ |
| 67 |
+ # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) |
| 68 |
+ # define AG_SCM_VEC_P(_v) scm_is_vector(_v) |
| 69 |
+ |
| 70 |
+-#else |
| 71 |
+-# error unknown GUILE_VERSION |
| 72 |
+- choke me. |
| 73 |
+ #endif |
| 74 |
+ |
| 75 |
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */ |
| 76 |
+--- a/configure |
| 77 |
++++ b/configure |
| 78 |
+@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; } |
| 79 |
+ PKG_CONFIG="" |
| 80 |
+ fi |
| 81 |
+ fi |
| 82 |
+- _guile_versions_to_search="2.0 1.8" |
| 83 |
++ _guile_versions_to_search="2.2 2.0 1.8" |
| 84 |
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then |
| 85 |
+ _guile_tmp="" |
| 86 |
+ for v in $_guile_versions_to_search; do |
Archives