tetromino 14/06/03 02:50:57 Modified: glade-3.16.1-underlinking.patch Added: glade-3.18.1-underlinking.patch Log: 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)
Revision Changes Path 1.2 dev-util/glade/files/glade-3.16.1-underlinking.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch?r1=1.1&r2=1.2 Index: glade-3.16.1-underlinking.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glade-3.16.1-underlinking.patch 11 Feb 2014 08:32:02 -0000 1.1 +++ glade-3.16.1-underlinking.patch 3 Jun 2014 02:50:57 -0000 1.2 @@ -21,7 +21,8 @@ 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 1.1 dev-util/glade/files/glade-3.18.1-underlinking.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.18.1-underlinking.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.18.1-underlinking.patch?rev=1.1&content-type=text/plain Index: glade-3.18.1-underlinking.patch =================================================================== >From 80c9532e39fac397960fc59eb407e596d9e8d2e4 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <[email protected]> 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
