rpms/bluez/devel 0001-Fix-DSO-linking.patch, NONE, 1.1 bluez.spec, 1.108, 1.109

Bastien Nocera hadess at fedoraproject.org
Mon Feb 15 10:45:10 UTC 2010


Author: hadess

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

Modified Files:
	bluez.spec 
Added Files:
	0001-Fix-DSO-linking.patch 
Log Message:
Fix DSO linking

0001-Fix-DSO-linking.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Fix-DSO-linking.patch ---
>From 6447181296e56e20c6b504978477d24cc55655e9 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 15 Feb 2010 10:41:40 +0000
Subject: [PATCH] Fix DSO linking

Explicitely link against libm, to avoid linking problems:
CCLD   sbc/sbctester
/usr/bin/ld: sbc/sbctester.o: undefined reference to symbol 'sqrt@@GLIBC_2.2.5'
/usr/bin/ld: note: 'sqrt@@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.redhat.com/show_bug.cgi?id=564799
---
 Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 584b921..fc7b2c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,7 @@ sbc_sbcenc_LDADD = sbc/libsbc.la
 if SNDFILE
 noinst_PROGRAMS += sbc/sbctester
 
-sbc_sbctester_LDADD = @SNDFILE_LIBS@
+sbc_sbctester_LDADD = @SNDFILE_LIBS@ -lm
 sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
 endif
 endif
-- 
1.6.6



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- bluez.spec	15 Feb 2010 10:04:16 -0000	1.108
+++ bluez.spec	15 Feb 2010 10:45:10 -0000	1.109
@@ -17,6 +17,8 @@ Patch1: bluez-utils-oui-usage.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=450081
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
 Patch2: bluez-try-utf8-harder.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=564799
+Patch3: 0001-Fix-DSO-linking.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=498756
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
@@ -128,6 +130,7 @@ This includes hidd, dund and pand.
 %setup -q
 %patch1 -p0 -b .oui
 %patch2 -p1 -b .non-utf8-name
+%patch3 -p1 -b .linking
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cable-pairing
 
@@ -273,6 +276,7 @@ fi
 * Mon Feb 15 2010 Bastien Nocera <bnocera at redhat.com> 4.61-1
 - Update to 4.61
 - Remove Wacom tablet enabler, now in the kernel
+- Fix linking with new DSO rules (#564799)
 
 * Mon Feb 15 2010 Bastien Nocera <bnocera at redhat.com> 4.60-2
 - Fix typo in init script (#558993)



More information about the scm-commits mailing list