diff options
author | Amy Winston <amynka@gentoo.org> | 2016-08-12 21:02:25 +0200 |
---|---|---|
committer | Amy Winston <amynka@gentoo.org> | 2016-08-12 21:07:49 +0200 |
commit | 251038429b247420f86268f22906ec69ede294cc (patch) | |
tree | 095edda9d236a8c992b49e4bba545c2934aa5305 /dev-scheme/guile/files | |
parent | dev-qt: version bump 5.7.0 (diff) | |
download | gentoo-251038429b247420f86268f22906ec69ede294cc.tar.gz gentoo-251038429b247420f86268f22906ec69ede294cc.tar.bz2 gentoo-251038429b247420f86268f22906ec69ede294cc.zip |
dev-scheme/guile: fix bug #590528
- Added patch from upstream for bug #590528
- Added +nls +networking recommended by upstream
- Removed old patch from upstream
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-scheme/guile/files')
-rw-r--r-- | dev-scheme/guile/files/guile-2.0.12-build-includes.patch | 41 | ||||
-rw-r--r-- | dev-scheme/guile/files/guile-2.0.12-build_includes2.patch | 48 |
2 files changed, 48 insertions, 41 deletions
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 deleted file mode 100644 index 60b44bcbd7e8..000000000000 --- a/dev-scheme/guile/files/guile-2.0.12-build-includes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From edd6d6e2805894e21afe51276d1af65d5395180d Mon Sep 17 00:00:00 2001 -From: Andy Wingo <wingo@pobox.com> -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/files/guile-2.0.12-build_includes2.patch b/dev-scheme/guile/files/guile-2.0.12-build_includes2.patch new file mode 100644 index 000000000000..320abb324d39 --- /dev/null +++ b/dev-scheme/guile/files/guile-2.0.12-build_includes2.patch @@ -0,0 +1,48 @@ +From 9eb8c3652d6a424a9c60da03584b8056497d1fdf Mon Sep 17 00:00:00 2001 +From: Mark H Weaver <mhw@netris.org> +Date: Thu, 11 Aug 2016 03:59:40 -0400 +Subject: build: .x and .doc files depend on generated includes. + +Fixes <https://bugs.gentoo.org/show_bug.cgi?id=590528>. + +* libguile/Makefile.am (BUILT_INCLUDES): New variable. +(BUILT_SOURCES): Put .i and other generated .h to BUILT_INCLUDES. +(DOT_X_FILES, EXTRA_DOT_X_FILES, DOT_DOC_FILES, EXTRA_DOT_DOC_FILES): +Depend on $(BUILT_INCLUDES), in place of scmconfig.h which is included +in $(BUILT_INCLUDES). +--- + libguile/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libguile/Makefile.am b/libguile/Makefile.am +index cd85604..1383c13 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. +@@ -735,9 +735,9 @@ SUFFIXES = .x .doc + .c.doc: + $(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts) + +-$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in version.h ++$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): $(BUILT_INCLUDES) snarf.h guile-snarf.in version.h + +-$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT) ++$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): $(BUILT_INCLUDES) snarf.h guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT) + + error.x: cpp-E.c + posix.x: cpp-SIG.c +-- +cgit v1.0 + |