From 0a425a084236e458dbbe60c22c04660c3298d5b5 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 10 Feb 2010 17:45:25 +0000 Subject: [PATCH] Fix libm linking --- 0001-Fix-libm-linking.patch | 30 ++++++++++++++++++++++++++++++ gedit.spec | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 0001-Fix-libm-linking.patch diff --git a/0001-Fix-libm-linking.patch b/0001-Fix-libm-linking.patch new file mode 100644 index 0000000..f9870c9 --- /dev/null +++ b/0001-Fix-libm-linking.patch @@ -0,0 +1,30 @@ +From 2df1c46f68d50c424970c44cc419d1ca7f87a9fd Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +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 + diff --git a/gedit.spec b/gedit.spec index 9d7c1f3..12b3316 100644 --- a/gedit.spec +++ b/gedit.spec @@ -45,6 +45,9 @@ Patch2: gedit-2.25.5-fix-python-path.patch # 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 plugins for gedit. %patch2 -p1 -b .fix-python-path %patch3 -p1 -b .print-to-file +%patch4 -p1 -b .libm autoreconf -f -i intltoolize -f