[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/

[Cyprien Nicolas]

commit:     24b394f25010419edeade6120526d4697bcd4115
Author:     Cyprien Nicolas (fulax) <gentoo <AT> fulax <DOT> fr>
AuthorDate: Sat Jun 22 16:51:31 2019 +0000
Commit:     Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Sat Jun 22 16:51:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=24b394f2

dev-scheme/guile: Fix for bug #590904 (LDFLAGS leak)

Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-scheme/guile/guile-2.2.5.ebuild | 6 +++++-
 dev-scheme/guile/guile-2.9.2.ebuild | 6 +++++-
 dev-scheme/guile/guile-9999.ebuild  | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dev-scheme/guile/guile-2.2.5.ebuild 
b/dev-scheme/guile/guile-2.2.5.ebuild
index 4f396476..2e0088b0 100644
--- a/dev-scheme/guile/guile-2.2.5.ebuild
+++ b/dev-scheme/guile/guile-2.2.5.ebuild
@@ -64,9 +64,13 @@ src_configure() {
 src_install() {
        default
 
-       # Maybe there is a proper way to do this? Symlink handled by eselect
+       # The guile.m4 macro files conflicts with other slots
        mv "${ED}"/usr/share/aclocal/guile.m4 
"${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
+       # Bug #590904, LDFLAGS are copied within the pkg-config gile
+       sed -i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-${MAJOR}.pc \
+               -e s:"${LDFLAGS}"::
+
        # From Novell
        #       https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
        dodir /usr/share/gdb/auto-load/$(get_libdir)

diff --git a/dev-scheme/guile/guile-2.9.2.ebuild 
b/dev-scheme/guile/guile-2.9.2.ebuild
index 18703848..f15a1db5 100644
--- a/dev-scheme/guile/guile-2.9.2.ebuild
+++ b/dev-scheme/guile/guile-2.9.2.ebuild
@@ -62,9 +62,13 @@ src_configure() {
 src_install() {
        default
 
-       # Maybe there is a proper way to do this? Symlink handled by eselect
+       # The guile.m4 macro files conflicts with other slots
        mv "${ED}"/usr/share/aclocal/guile.m4 
"${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
+       # Bug #590904, LDFLAGS are copied within the pkg-config gile
+       sed -i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-${MAJOR}.pc \
+               -e s:"${LDFLAGS}"::
+
        # From Novell
        #       https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
        dodir /usr/share/gdb/auto-load/$(get_libdir)

diff --git a/dev-scheme/guile/guile-9999.ebuild 
b/dev-scheme/guile/guile-9999.ebuild
index 8ae5dfd8..8feb94b2 100644
--- a/dev-scheme/guile/guile-9999.ebuild
+++ b/dev-scheme/guile/guile-9999.ebuild
@@ -69,9 +69,13 @@ src_configure() {
 src_install() {
        default
 
-       # Maybe there is a proper way to do this? Symlink handled by eselect
+       # The guile.m4 macro files conflicts with other slots
        mv "${ED}"/usr/share/aclocal/guile.m4 
"${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
+       # Bug #590904, LDFLAGS are copied within the pkg-config gile
+       sed -i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-${MAJOR}.pc \
+               -e s:"${LDFLAGS}"::
+
        # From Novell
        #       https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
        dodir /usr/share/gdb/auto-load/$(get_libdir)