diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-11-05 21:49:28 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-11-05 21:49:28 +0000 |
| commit | 8ae4d94071b1953ddf807863c4191954593111d6 (patch) | |
| tree | 8c1e794b81d6c610d8ef67d8b1fb8dbe67545cff /app-mobilephone | |
| parent | Version bump (diff) | |
| download | gentoo-2-8ae4d94071b1953ddf807863c4191954593111d6.tar.gz gentoo-2-8ae4d94071b1953ddf807863c4191954593111d6.tar.bz2 gentoo-2-8ae4d94071b1953ddf807863c4191954593111d6.zip | |
Fix broken compilation when obexftp libraries are installed and linked with inexistent version of libbluetooth.so (#244881).
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-mobilephone')
| -rw-r--r-- | app-mobilephone/obexftp/ChangeLog | 7 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch | 22 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/obexftp-0.22.ebuild | 8 |
3 files changed, 35 insertions, 2 deletions
diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog index eb3fd501f543..883099f68930 100644 --- a/app-mobilephone/obexftp/ChangeLog +++ b/app-mobilephone/obexftp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-mobilephone/obexftp # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.39 2008/08/25 17:25:51 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.40 2008/11/05 21:49:28 mrness Exp $ + + 05 Nov 2008; Alin Năstac <mrness@gentoo.org> + +files/obexftp-0.22-ruby-libpath.patch, obexftp-0.22.ebuild: + Fix broken compilation when obexftp libraries are installed and linked with + inexistent version of libbluetooth.so (#244881). 25 Aug 2008; nixnut <nixnut@gentoo.org> ChangeLog: Stable on ppc wrt bug 224409 diff --git a/app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch b/app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch new file mode 100644 index 000000000000..c992325c7b9f --- /dev/null +++ b/app-mobilephone/obexftp/files/obexftp-0.22-ruby-libpath.patch @@ -0,0 +1,22 @@ +diff -ur obexftp-0.22.orig/swig/ruby/extconf.rb obexftp-0.22/swig/ruby/extconf.rb +--- obexftp-0.22.orig/swig/ruby/extconf.rb 2008-06-15 19:18:58.000000000 +0000 ++++ obexftp-0.22/swig/ruby/extconf.rb 2008-11-05 21:38:45.000000000 +0000 +@@ -21,10 +21,6 @@ + end + + dir_config('obexftp') +-if have_library('openobex', 'OBEX_Init') and +- find_library('bfb', 'bfb_io_open', '../../bfb/.libs') and +- find_library('multicobex', 'cobex_ctrans', '../../multicobex/.libs') and +- find_library('obexftp', 'obexftp_open', '../../obexftp/.libs') + create_makefile('obexftp') + + # hack 2: strip all rpath references +@@ -33,7 +29,3 @@ + out.puts line.gsub(/-Wl,-R'[^']*'/, '') + end + end +-else +- puts 'obex libs not found' +-end +- diff --git a/app-mobilephone/obexftp/obexftp-0.22.ebuild b/app-mobilephone/obexftp/obexftp-0.22.ebuild index cfa1b30b0e77..d34f5e38a25a 100644 --- a/app-mobilephone/obexftp/obexftp-0.22.ebuild +++ b/app-mobilephone/obexftp/obexftp-0.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.3 2008/06/22 00:04:47 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.4 2008/11/05 21:49:28 mrness Exp $ inherit eutils perl-module flag-o-matic python @@ -23,6 +23,12 @@ DEPEND="${RDEPEND} swig? ( dev-lang/swig ) dev-util/pkgconfig" +src_unpack() { + unpack ${A} + + epatch "${FILESDIR}"/${P}-ruby-libpath.patch +} + src_compile() { # do not byte-compile python module if use python; then |