Really fix linking failure with ld.gold (bug #512068, thanks to Mark R. Pariente for reporting).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 57 insertions, 4 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 45d4e9d8a553..3ab09f59423c 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.215 2014/05/31 06:04:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.216 2014/06/03 02:50:57 tetromino Exp $
+
+  03 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> glade-3.18.3.ebuild,
+  files/glade-3.16.1-underlinking.patch,
+  +files/glade-3.18.1-underlinking.patch:
+  Really fix linking failure with ld.gold (bug #512068, thanks to Mark R.
+  Pariente for reporting).
 
 *glade-3.8.5 (31 May 2014)
 *glade-3.18.3 (31 May 2014)
diff --git a/dev-util/glade/files/glade-3.16.1-underlinking.patch b/dev-util/glade/files/glade-3.16.1-underlinking.patch
index b97426c2a6dc..b6817a4bc01d 100644
--- a/dev-util/glade/files/glade-3.16.1-underlinking.patch
+++ b/dev-util/glade/files/glade-3.16.1-underlinking.patch
@@ -21,7 +21,8 @@ index 87d610c..8fc02a0 100644
  Gladeui_2_0_gir_INCLUDES = Gtk-3.0
  Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
 -Gladeui_2_0_gir_LIBS = libgladeui-2.la
-+Gladeui_2_0_gir_LIBS = libgladeui-2.la m
++Gladeui_2_0_gir_LIBS = libgladeui-2.la
++Gladeui_2_0_gir_LIBADD = -lm
  Gladeui_2_0_gir_FILES = $(introspection_sources)
  INTROSPECTION_GIRS += Gladeui-2.0.gir
  
diff --git a/dev-util/glade/files/glade-3.18.1-underlinking.patch b/dev-util/glade/files/glade-3.18.1-underlinking.patch
new file mode 100644
index 000000000000..f34c03a2da58
--- /dev/null
+++ b/dev-util/glade/files/glade-3.18.1-underlinking.patch
@@ -0,0 +1,46 @@
+From 80c9532e39fac397960fc59eb407e596d9e8d2e4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 2 Jun 2014 22:41:14 -0400
+Subject: [PATCH] build: Explicitly link libgladeui with libm
+
+Fixes underlinking failure with ld.gold.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=724104
+---
+ configure.ac        | 6 ++++++
+ gladeui/Makefile.am | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c86e947..7bf65e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,6 +133,12 @@ AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
+         ])
+ 
+ dnl ================================================================
++dnl libm
++dnl ================================================================
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
++dnl ================================================================
+ dnl Check for gtk-doc
+ dnl ================================================================
+ GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index c63b6a3..77af09c 100644
+--- a/gladeui/Makefile.am
++++ b/gladeui/Makefile.am
+@@ -145,7 +145,7 @@ libgladeui_2_la_CFLAGS =    \
+ 	$(AM_CFLAGS)
+ 
+ libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
++libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) $(LIBM)
+ 
+ libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
+ libgladeuiinclude_HEADERS = \
+-- 
+2.0.0
+
diff --git a/dev-util/glade/glade-3.18.3.ebuild b/dev-util/glade/glade-3.18.3.ebuild
index 3b3c22ab3ee9..e927e9481e31 100644
--- a/dev-util/glade/glade-3.18.3.ebuild
+++ b/dev-util/glade/glade-3.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.18.3.ebuild,v 1.1 2014/05/31 06:04:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.18.3.ebuild,v 1.2 2014/06/03 02:50:57 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -56,7 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.14.1-doc-version.patch
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=724104
-	epatch"${FILESDIR}"/${PN}-3.16.1-underlinking.patch
+	epatch "${FILESDIR}"/${PN}-3.18.1-underlinking.patch
 
 	eautoreconf