Fix libX11 linking

This commit is contained in:
Bastien Nocera 2010-02-10 17:57:01 +00:00
parent 0a425a0842
commit 14ac0b1bf1
2 changed files with 20 additions and 7 deletions

View File

@ -1,20 +1,25 @@
From 2df1c46f68d50c424970c44cc419d1ca7f87a9fd Mon Sep 17 00:00:00 2001
From d0b56b9154ad47a4391839b814587e76d70e5fb4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 10 Feb 2010 17:42:24 +0000
Subject: [PATCH] Fix libm linking
Subject: [PATCH] Fix libm and libX11 linking
Otherwise we fail to link against libm:
Otherwise we fail to link:
/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
And:
/usr/bin/ld: ./.libs/libgedit.a(gedit-utils.o): undefined reference to symbol 'XFree'
/usr/bin/ld: note: 'XFree' is defined in DSO /usr/lib64/libX11.so.6 so try adding it to the linker command line
/usr/lib64/libX11.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(-)
configure.ac | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index b9c2632..85812eb 100644
index b9c2632..63238b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
@ -25,6 +30,14 @@ index b9c2632..85812eb 100644
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
@@ -252,6 +253,7 @@ PKG_CHECK_MODULES(GEDIT, [
gio-2.0 >= 2.23.1
gtk+-2.0 >= 2.16.0
gtksourceview-2.0 >= 2.9.4
+ x11
gconf-2.0 >= 1.1.11
])
--
1.6.6

View File

@ -46,7 +46,7 @@ Patch2: gedit-2.25.5-fix-python-path.patch
Patch3: print-to-file.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=609562
Patch4: 0001-Fix-libm-linking.patch
Patch4: 0001-Fix-libm-and-libX11-linking.patch
BuildRequires: gnome-common
BuildRequires: glib2-devel >= %{glib2_version}