summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-10-16 03:47:52 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-10-16 03:47:52 +0000
commit90ad9777454e1be2fbf29880e598e8154438bdab (patch)
tree9d0f4711aa43ba3f587713d27729dbe92eda88aa /gnome-base/gnome-panel/files
parentRestricting to apache 2.2 (diff)
downloadgentoo-2-90ad9777454e1be2fbf29880e598e8154438bdab.tar.gz
gentoo-2-90ad9777454e1be2fbf29880e598e8154438bdab.tar.bz2
gentoo-2-90ad9777454e1be2fbf29880e598e8154438bdab.zip
Fix linking failure with gold (bug #384533, thanks to Naohiro Aota). Drop useless USE=doc, it only regenerated documentation. Update license. Drop old.
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-panel/files')
-rw-r--r--gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch
new file mode 100644
index 000000000000..008600344c84
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch
@@ -0,0 +1,42 @@
+From cd9bd4858f82fc6830c01aa8168bfafab6b6b868 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 15 Oct 2012 23:21:06 -0400
+Subject: [PATCH] build: fix underlinking
+
+https://bugs.gentoo.org/show_bug.cgi?id=384533
+---
+ configure.ac | 3 +++
+ gnome-panel/Makefile.am | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3f8c214..da37bd9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,9 @@ AC_PROG_LIBTOOL
+ #AC_PROG_SED available in 2.59b
+ AM_PROG_CC_C_O
+
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ AM_PATH_PYTHON
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
+index a341333..59c5dae 100644
+--- a/gnome-panel/Makefile.am
++++ b/gnome-panel/Makefile.am
+@@ -134,7 +134,8 @@ gnome_panel_LDADD = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(PANEL_LIBS) \
+ $(XRANDR_LIBS) \
+- $(X_LIBS)
++ $(X_LIBS) \
++ $(LIBM)
+
+ gnome_panel_LDFLAGS = -export-dynamic
+
+--
+1.7.12.3
+