diff options
| author |   Amy Liffey <amynka@gentoo.org> | 2017-04-22 16:36:14 +0200 |
|---|---|---|
| committer | Amy Liffey <amynka@gentoo.org> | 2017-04-22 16:37:47 +0200 |
| commit | 3b8488127b6dac13f3d0b285a954c21ca6255287 (patch) | |
| tree | 23c5c11d8bcda190604aa9eb68afb85632d62c3c /dev-scheme | |
| parent | kde-apps/step: Add USE=nls and missing DEPEND (diff) | |
| download | gentoo-3b8488127b6dac13f3d0b285a954c21ca6255287.tar.gz gentoo-3b8488127b6dac13f3d0b285a954c21ca6255287.tar.bz2 gentoo-3b8488127b6dac13f3d0b285a954c21ca6255287.zip | |
dev-scheme/guile: add upstream patch bug #608190
Package-Manager: portage-2.3.3
Diffstat (limited to 'dev-scheme')
| -rw-r--r-- | dev-scheme/guile/files/guile-2-snarf.patch | 47 | ||||
| -rw-r--r-- | dev-scheme/guile/guile-2.0.13-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-scheme/guile/guile-2.0.14.ebuild | 2 |
3 files changed, 51 insertions, 0 deletions
diff --git a/dev-scheme/guile/files/guile-2-snarf.patch b/dev-scheme/guile/files/guile-2-snarf.patch new file mode 100644 index 000000000000..c6ab5cd48cd6 --- /dev/null +++ b/dev-scheme/guile/files/guile-2-snarf.patch @@ -0,0 +1,47 @@ +From f775ab3654357fcaad294b95efb0b1c16de1eda8 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Sun, 19 Feb 2017 22:58:40 +0000 +Subject: guile-snarf: skip -g* arguments to avoid build failure + +* libguile/guile-snarf.in: skip -g* arguments to avoid failure on + -ggdb3. + +Bug: https://bugs.gentoo.org/608190 +Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=25803 +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + libguile/guile-snarf.in | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in +index 47bbc04..22dc1d3 100644 +--- a/libguile/guile-snarf.in ++++ b/libguile/guile-snarf.in +@@ -95,10 +95,22 @@ if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi + + trap "rm -rf $tempdir" 0 1 2 15 + ++# filter out -g* flags from commandline ++# as some flags like -ggdb3 cause CPP ++ ++cpp_args="" ++for arg in "$@" ++do ++ case "$arg" in ++ -g*) ;; # skip debug flag ++ *) cpp_args="$cpp_args $arg" ;; ++ esac ++done ++ + if [ ! "$outfile" = "-" ] ; then +- modern_snarf "$@" > $outfile ++ modern_snarf $cpp_args > $outfile + else +- modern_snarf "$@" ++ modern_snarf $cpp_args + fi + + # zonk outfile if errors occurred +-- +cgit v1.0-41-gc330 + diff --git a/dev-scheme/guile/guile-2.0.13-r1.ebuild b/dev-scheme/guile/guile-2.0.13-r1.ebuild index 429ee464a026..78edbb0f216a 100644 --- a/dev-scheme/guile/guile-2.0.13-r1.ebuild +++ b/dev-scheme/guile/guile-2.0.13-r1.ebuild @@ -32,6 +32,8 @@ MAJOR="2.0" DOCS=( GUILE-VERSION HACKING README ) +PATCHES=( "${FILESDIR}/${PN}-2-snarf.patch" ) + src_prepare() { default eautoreconf diff --git a/dev-scheme/guile/guile-2.0.14.ebuild b/dev-scheme/guile/guile-2.0.14.ebuild index 429ee464a026..78edbb0f216a 100644 --- a/dev-scheme/guile/guile-2.0.14.ebuild +++ b/dev-scheme/guile/guile-2.0.14.ebuild @@ -32,6 +32,8 @@ MAJOR="2.0" DOCS=( GUILE-VERSION HACKING README ) +PATCHES=( "${FILESDIR}/${PN}-2-snarf.patch" ) + src_prepare() { default eautoreconf |