From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE71E139083 for ; Mon, 4 Dec 2017 14:51:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFFFBE0EDE; Mon, 4 Dec 2017 14:51:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC6A6E0EDE for ; Mon, 4 Dec 2017 14:51:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2221533BEBE for ; Mon, 4 Dec 2017 14:51:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2427AD74 for ; Mon, 4 Dec 2017 14:51:45 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1512399102.2b5e4127a29101caf452f81263532016764a264f.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/autogen/autogen-5.18.12.ebuild sys-devel/autogen/files/autogen-guile-2.2.patch X-VCS-Directories: sys-devel/autogen/ sys-devel/autogen/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2b5e4127a29101caf452f81263532016764a264f X-VCS-Branch: master Date: Mon, 4 Dec 2017 14:51:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f5a3aebc-5f35-4269-9a5f-26ebd6927cfd X-Archives-Hash: ec240270806f7149ee25c79397f9e411 commit: 2b5e4127a29101caf452f81263532016764a264f Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 4 14:50:48 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 4 14:51:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5e4127 sys-devel/autogen: Fixed build with =dev-scheme/guile-2.2* Package-Manager: Portage-2.3.16, Repoman-2.3.6 sys-devel/autogen/autogen-5.18.12.ebuild | 10 ++++++-- sys-devel/autogen/files/autogen-guile-2.2.patch | 34 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild b/sys-devel/autogen/autogen-5.18.12.ebuild index 9d29603d3e7..65274d31baa 100644 --- a/sys-devel/autogen/autogen-5.18.12.ebuild +++ b/sys-devel/autogen/autogen-5.18.12.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils toolchain-funcs +inherit ltprune toolchain-funcs DESCRIPTION="Program and text file generation" HOMEPAGE="https://www.gnu.org/software/autogen/" @@ -20,7 +20,13 @@ RDEPEND=">=dev-scheme/guile-2.0:= dev-libs/libxml2" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-guile-2.2.patch" +) + src_prepare() { + default + # https://savannah.gnu.org/support/index.php?109050 sed -i \ -e "/--cflags-only-I/s:pkg-config:$(tc-getPKG_CONFIG):" \ diff --git a/sys-devel/autogen/files/autogen-guile-2.2.patch b/sys-devel/autogen/files/autogen-guile-2.2.patch new file mode 100644 index 00000000000..8ef904adb02 --- /dev/null +++ b/sys-devel/autogen/files/autogen-guile-2.2.patch @@ -0,0 +1,34 @@ +https://raw.githubusercontent.com/Homebrew/formula-patches/master/autogen/allow-guile-2.2.diff + +--- a/agen5/guile-iface.h ++++ b/agen5/guile-iface.h +@@ -9,7 +9,7 @@ + # error AutoGen does not work with this version of Guile + choke me. + +-#elif GUILE_VERSION < 201000 ++#else + # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) + # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) + # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) +@@ -24,9 +24,6 @@ + # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) + # define AG_SCM_VEC_P(_v) scm_is_vector(_v) + +-#else +-# error unknown GUILE_VERSION +- choke me. + #endif + + #endif /* MUTATING_GUILE_IFACE_H_GUARD */ +--- a/configure ++++ b/configure +@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; } + PKG_CONFIG="" + fi + fi +- _guile_versions_to_search="2.0 1.8" ++ _guile_versions_to_search="2.2 2.0 1.8" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do