Fix building with -Wl,--as-needed wrt #276250 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/beaglefs/ChangeLog b/sys-fs/beaglefs/ChangeLog
index fa3a8867ddee1bdde58f3dffefef408dbf4fc294..90e94291cf6ad897d1457f3113cfe583f3228a47 100644 (file)
--- a/sys-fs/beaglefs/ChangeLog
+++ b/sys-fs/beaglefs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/beaglefs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/ChangeLog,v 1.5 2008/07/25 07:43:32 ford_prefect Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/ChangeLog,v 1.6 2010/06/29 14:42:02 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> beaglefs-1.0.3.ebuild,
+  +files/beaglefs-1.0.3-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #276250 by Kacper Kowalik.
 
   25 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org>
   +files/beaglefs-1.0.3-libbeagle-0.3.patch, metadata.xml,

diff --git a/sys-fs/beaglefs/Manifest b/sys-fs/beaglefs/Manifest
index 891d2e44885679d82557c2577914e23a2db99a57..58d63c6298ad291cc4ad45a9aa7fd6c13f29a8f1 100644 (file)
--- a/sys-fs/beaglefs/Manifest
+++ b/sys-fs/beaglefs/Manifest
@@ -1,5 +1,6 @@
+AUX beaglefs-1.0.3-asneeded.patch 389 RMD160 99554f362389e0524ff58dd281731b3567f4edfe SHA1 a7cef6d02c5ec718d001c26216295f6858b51ad6 SHA256 3cfd63e9ab247a8c51a2324bceb70128c9525460215bcbc90cfe085ccad9d3aa
 AUX beaglefs-1.0.3-libbeagle-0.3.patch 1097 RMD160 3a61671ad75a0fb7a7c214293e8c9372d0b5c579 SHA1 816cef84fb39dfe96a962266b2f2f7c7429eb045 SHA256 dd2ac7ee3e2fab9e45289b4741e2ffc8872fb45bf9710840fb7309b4f6d663d7
 DIST beaglefs-1.0.3.tar.bz2 13170 RMD160 e72af129af606013bb5cf68b38da2f9a3a78da31 SHA1 c3b0eb667edf967be19ea806a34673733c39aee2 SHA256 2f7eff22ba178b1ee084caa081fed70257bf4debf0a29fb57d06c10f5f3c4b78
-EBUILD beaglefs-1.0.3.ebuild 960 RMD160 c7308ec4d9e364f18cba3ff84d999395ba960414 SHA1 40d2cedfcb725817772cdd892692f9e5080254e8 SHA256 6b495e2982d639508c8fd4d4749a68113f5ee80b631860cb6afd7c50761c07dc
-MISC ChangeLog 900 RMD160 d0bed5ee89840848df846de2d6a37f7efd752915 SHA1 b4f30018dfa9da694672b991f3fc6375ec6bd720 SHA256 3c43295af30100ee8a52d1502ec64392d38a767c2f6691e2316d7525369a3269
+EBUILD beaglefs-1.0.3.ebuild 1010 RMD160 9305df623bb264e81015129c460a2826ce2b7047 SHA1 f061c3769fb95fc106c581fb8556d515afd7716c SHA256 f4ca19a34d7e781ed90db7ca294516da33bdc1cedf5cf76e60c0d873ba551c8d
+MISC ChangeLog 1082 RMD160 97e6070412e3fc940ee46846805661d3e2cf1a41 SHA1 d1ca86ade73b720bc3fa6d5d8812b53f1d805bb5 SHA256 d120bedab580247f22db75a92f65b181966ce0df5aec4d7fae5df8d2d4201103
 MISC metadata.xml 260 RMD160 b9de4bf81b97f6dd2a1c21a106a1d3eaa6028c5f SHA1 bfee11bc10728bfb056d330e4307f8c21a2987e6 SHA256 425f0ef54e04143701f82ce09dfa5cb6bd4015f72ff3a7e77d623ac0dabf9b6c

diff --git a/sys-fs/beaglefs/beaglefs-1.0.3.ebuild b/sys-fs/beaglefs/beaglefs-1.0.3.ebuild
index ca53134a2d6b43fd3485c02698ad40b30f835d7c..1e809baa633802807ad8a393162c38c8cb5b57b3 100644 (file)
--- a/sys-fs/beaglefs/beaglefs-1.0.3.ebuild
+++ b/sys-fs/beaglefs/beaglefs-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/beaglefs-1.0.3.ebuild,v 1.3 2008/07/25 07:43:32 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/beaglefs-1.0.3.ebuild,v 1.4 2010/06/29 14:42:02 ssuominen Exp $
 
 inherit eutils
 
@@ -19,9 +19,11 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
        unpack ${A}
+       cd "${S}"
        if has_version dev-libs/libbeagle; then
                epatch "${FILESDIR}/${P}-libbeagle-0.3.patch"
        fi
+       epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {

diff --git a/sys-fs/beaglefs/files/beaglefs-1.0.3-asneeded.patch b/sys-fs/beaglefs/files/beaglefs-1.0.3-asneeded.patch
new file mode 100644 (file)
index 0000000..8d14a8c
--- /dev/null
+++ b/sys-fs/beaglefs/files/beaglefs-1.0.3-asneeded.patch
@@ -0,0 +1,19 @@
+--- Makefile
++++ Makefile
+@@ -23,12 +23,12 @@
+       @$(CC)                  \
+       $(CFLAGS)               \
+       $(GTHREAD_CFLAGS)       \
+-      $(GTHREAD_LIBS)         \
+       $(FUSE_CFLAGS)          \
+-      $(FUSE_LIBS)            \
+       $(BEAGLE_CFLAGS)        \
+-      $(BEAGLE_LIBS)          \
+-      -o beaglefs beaglefs.c dir.c file.c hit.c inode.c
++      -o beaglefs beaglefs.c dir.c file.c hit.c inode.c \
++      $(GTHREAD_LIBS)         \
++      $(FUSE_LIBS)            \
++      $(BEAGLE_LIBS)          
+ 
+ clean:
+       @rm -f beaglefs