rpms/gedit/devel 0001-Fix-libm-linking.patch, NONE, 1.1 gedit.spec, 1.212, 1.213

Bastien Nocera hadess at fedoraproject.org
Wed Feb 10 17:45:25 UTC 2010


Author: hadess

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16435

Modified Files:
	gedit.spec 
Added Files:
	0001-Fix-libm-linking.patch 
Log Message:
Fix libm linking

0001-Fix-libm-linking.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0001-Fix-libm-linking.patch ---
>From 2df1c46f68d50c424970c44cc419d1ca7f87a9fd Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 10 Feb 2010 17:42:24 +0000
Subject: [PATCH] Fix libm linking

Otherwise we fail to link against libm:
/usr/bin/ld: ./.libs/libgedit.a(gedit-print-preview.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
/usr/bin/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
/lib64/libm.so.6: could not read symbols: Invalid operation

https://bugzilla.gnome.org/show_bug.cgi?id=609562
---
 configure.ac |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9c2632..85812eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
 GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
 AC_CHECK_FUNCS(fsync)
 AC_CHECK_FUNC(sigaction)
+AC_CHECK_LIB(m, floor)
 
 dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
-- 
1.6.6



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- gedit.spec	10 Feb 2010 16:25:26 -0000	1.212
+++ gedit.spec	10 Feb 2010 17:45:25 -0000	1.213
@@ -45,6 +45,9 @@ Patch2: gedit-2.25.5-fix-python-path.pat
 # http://bugzilla.gnome.org/show_bug.cgi?id=587053
 Patch3: print-to-file.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=609562
+Patch4: 0001-Fix-libm-linking.patch
+
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -111,6 +114,7 @@ Install gedit-devel if you want to write
 
 %patch2 -p1 -b .fix-python-path
 %patch3 -p1 -b .print-to-file
+%patch4 -p1 -b .libm
 
 autoreconf -f -i
 intltoolize -f



More information about the scm-commits mailing list