Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-mobilephone/obexftp/files: obexftp-0.22-ruby-libpath.patch
Date: Wed, 05 Nov 2008 21:49:31
Message-Id: E1KxqFk-0006nA-Hx@stork.gentoo.org
1 mrness 08/11/05 21:49:28
2
3 Added: obexftp-0.22-ruby-libpath.patch
4 Log:
5 Fix broken compilation when obexftp libraries are installed and linked with inexistent version of libbluetooth.so (#244881).
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch?rev=1.1&content-type=text/plain
13
14 Index: obexftp-0.22-ruby-libpath.patch
15 ===================================================================
16 diff -ur obexftp-0.22.orig/swig/ruby/extconf.rb obexftp-0.22/swig/ruby/extconf.rb
17 --- obexftp-0.22.orig/swig/ruby/extconf.rb 2008-06-15 19:18:58.000000000 +0000
18 +++ obexftp-0.22/swig/ruby/extconf.rb 2008-11-05 21:38:45.000000000 +0000
19 @@ -21,10 +21,6 @@
20 end
21
22 dir_config('obexftp')
23 -if have_library('openobex', 'OBEX_Init') and
24 - find_library('bfb', 'bfb_io_open', '../../bfb/.libs') and
25 - find_library('multicobex', 'cobex_ctrans', '../../multicobex/.libs') and
26 - find_library('obexftp', 'obexftp_open', '../../obexftp/.libs')
27 create_makefile('obexftp')
28
29 # hack 2: strip all rpath references
30 @@ -33,7 +29,3 @@
31 out.puts line.gsub(/-Wl,-R'[^']*'/, '')
32 end
33 end
34 -else
35 - puts 'obex libs not found'
36 -end
37 -