| 1 |
tetromino 14/06/03 02:50:57 |
| 2 |
|
| 3 |
Modified: glade-3.16.1-underlinking.patch |
| 4 |
Added: glade-3.18.1-underlinking.patch |
| 5 |
Log: |
| 6 |
Really fix linking failure with ld.gold (bug #512068, thanks to Mark R. Pariente for reporting). |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-util/glade/files/glade-3.16.1-underlinking.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch?rev=1.2&view=markup |
| 14 |
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 |
| 15 |
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 |
| 16 |
|
| 17 |
Index: glade-3.16.1-underlinking.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- glade-3.16.1-underlinking.patch 11 Feb 2014 08:32:02 -0000 1.1 |
| 24 |
+++ glade-3.16.1-underlinking.patch 3 Jun 2014 02:50:57 -0000 1.2 |
| 25 |
@@ -21,7 +21,8 @@ |
| 26 |
Gladeui_2_0_gir_INCLUDES = Gtk-3.0 |
| 27 |
Gladeui_2_0_gir_CFLAGS = $(INCLUDES) |
| 28 |
-Gladeui_2_0_gir_LIBS = libgladeui-2.la |
| 29 |
-+Gladeui_2_0_gir_LIBS = libgladeui-2.la m |
| 30 |
++Gladeui_2_0_gir_LIBS = libgladeui-2.la |
| 31 |
++Gladeui_2_0_gir_LIBADD = -lm |
| 32 |
Gladeui_2_0_gir_FILES = $(introspection_sources) |
| 33 |
INTROSPECTION_GIRS += Gladeui-2.0.gir |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 dev-util/glade/files/glade-3.18.1-underlinking.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.18.1-underlinking.patch?rev=1.1&view=markup |
| 41 |
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 |
| 42 |
|
| 43 |
Index: glade-3.18.1-underlinking.patch |
| 44 |
=================================================================== |
| 45 |
From 80c9532e39fac397960fc59eb407e596d9e8d2e4 Mon Sep 17 00:00:00 2001 |
| 46 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 47 |
Date: Mon, 2 Jun 2014 22:41:14 -0400 |
| 48 |
Subject: [PATCH] build: Explicitly link libgladeui with libm |
| 49 |
|
| 50 |
Fixes underlinking failure with ld.gold. |
| 51 |
|
| 52 |
https://bugzilla.gnome.org/show_bug.cgi?id=724104 |
| 53 |
--- |
| 54 |
configure.ac | 6 ++++++ |
| 55 |
gladeui/Makefile.am | 2 +- |
| 56 |
2 files changed, 7 insertions(+), 1 deletion(-) |
| 57 |
|
| 58 |
diff --git a/configure.ac b/configure.ac |
| 59 |
index c86e947..7bf65e5 100644 |
| 60 |
--- a/configure.ac |
| 61 |
+++ b/configure.ac |
| 62 |
@@ -133,6 +133,12 @@ AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);], |
| 63 |
]) |
| 64 |
|
| 65 |
dnl ================================================================ |
| 66 |
+dnl libm |
| 67 |
+dnl ================================================================ |
| 68 |
+AC_CHECK_LIBM |
| 69 |
+AC_SUBST(LIBM) |
| 70 |
+ |
| 71 |
+dnl ================================================================ |
| 72 |
dnl Check for gtk-doc |
| 73 |
dnl ================================================================ |
| 74 |
GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) |
| 75 |
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am |
| 76 |
index c63b6a3..77af09c 100644 |
| 77 |
--- a/gladeui/Makefile.am |
| 78 |
+++ b/gladeui/Makefile.am |
| 79 |
@@ -145,7 +145,7 @@ libgladeui_2_la_CFLAGS = \ |
| 80 |
$(AM_CFLAGS) |
| 81 |
|
| 82 |
libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) |
| 83 |
-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) |
| 84 |
+libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) $(LIBM) |
| 85 |
|
| 86 |
libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui |
| 87 |
libgladeuiinclude_HEADERS = \ |
| 88 |
-- |
| 89 |
2.0.0 |
Archives