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 EED5513832E for ; Sun, 7 Aug 2016 19:10:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12FCC21C193; Sun, 7 Aug 2016 19:10:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FE6921C193 for ; Sun, 7 Aug 2016 19:10:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5CE1340B66 for ; Sun, 7 Aug 2016 19:10:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB78C7DA for ; Sun, 7 Aug 2016 19:10:47 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1470596590.ad481adb43d97f0e37294a9706184fe94550824f.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/, dev-scheme/guile/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/guile/files/guile-2.0.12-build-includes.patch dev-scheme/guile/guile-2.0.12.ebuild X-VCS-Directories: dev-scheme/guile/files/ dev-scheme/guile/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: ad481adb43d97f0e37294a9706184fe94550824f X-VCS-Branch: master Date: Sun, 7 Aug 2016 19:10:47 +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: d4657e60-3713-4f76-b957-11fe7cbc6e72 X-Archives-Hash: 1fe5a7fd3f0bf2682b7e05391ae24891 commit: ad481adb43d97f0e37294a9706184fe94550824f Author: Amy Winston gentoo org> AuthorDate: Sun Aug 7 19:01:05 2016 +0000 Commit: Amy Winston gentoo org> CommitDate: Sun Aug 7 19:03:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad481adb dev-scheme/guile: fixes for bug #590528,#590660 - Added patch for built_includes by upstream Andy Wingo - Symlink path changed Package-Manager: portage-2.2.28 .../guile/files/guile-2.0.12-build-includes.patch | 41 ++++++++++++++++++++++ dev-scheme/guile/guile-2.0.12.ebuild | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dev-scheme/guile/files/guile-2.0.12-build-includes.patch b/dev-scheme/guile/files/guile-2.0.12-build-includes.patch new file mode 100644 index 0000000..60b44bc --- /dev/null +++ b/dev-scheme/guile/files/guile-2.0.12-build-includes.patch @@ -0,0 +1,41 @@ +From edd6d6e2805894e21afe51276d1af65d5395180d Mon Sep 17 00:00:00 2001 +From: Andy Wingo +Date: Sun, 07 Aug 2016 10:23:50 +0000 +Subject: Snarfing .x depends on built headers + +* libguile/Makefile.am (BUILT_INCLUDES): New variable. + (BUILT_SOURCES): Put .i and other generated .h to BUILT_INCLUDES. + (.c.x, .c.doc): Depend on BUILT_INCLUDES. Fixes + https://bugs.gentoo.org/show_bug.cgi?id=590528. +--- +diff --git a/libguile/Makefile.am b/libguile/Makefile.am +index cd85604..4c54744 100644 +--- a/libguile/Makefile.am ++++ b/libguile/Makefile.am +@@ -430,9 +430,9 @@ DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i + .c.i: + $(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@ + +-BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \ +- scmconfig.h \ +- $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) ++BUILT_INCLUDES = $(DOT_I_FILES) scmconfig.h ++BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h $(BUILT_INCLUDES) \ ++ $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) + + # Force the generation of `guile-procedures.texi' because the top-level + # Makefile expects it to be built. +@@ -730,9 +730,9 @@ snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) + + SUFFIXES = .x .doc + +-.c.x: ++.c.x: $(BUILT_INCLUDES) + $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts) +-.c.doc: ++.c.doc: $(BUILT_INCLUDES) + $(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts) + + $(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in version.h +-- +cgit v0.9.0.2 diff --git a/dev-scheme/guile/guile-2.0.12.ebuild b/dev-scheme/guile/guile-2.0.12.ebuild index f20a701..976c483 100644 --- a/dev-scheme/guile/guile-2.0.12.ebuild +++ b/dev-scheme/guile/guile-2.0.12.ebuild @@ -30,6 +30,7 @@ DEPEND="${RDEPEND} SLOT="12" MAJOR="2.0" +PATCHES=( "${FILESDIR}/${P}-build-includes.patch" ) #bug 590528 patched by upstream DOCS=( GUILE-VERSION HACKING README ) src_configure() { @@ -67,7 +68,7 @@ src_install() { keepdir /usr/share/guile/site # Dark magic necessary for some deps - dosym /usr/$(get_libdir)/libguile-2.0.so /usr/$(get_libdir)/libguile.so + dosym libguile-2.0.so /usr/$(get_libdir)/libguile.so } pkg_postinst() {