summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2009-03-16 08:20:18 +0000
committerTiziano Müller <dev-zero@gentoo.org>2009-03-16 08:20:18 +0000
commit6ac0288c2f217309824d8e207f9842310405781f (patch)
tree20e414e968fed7e92334e0d2e02e17dedeca1d17 /sys-fs/encfs
parentDon't pull in xfce4-settings on alpha (diff)
downloadgentoo-2-6ac0288c2f217309824d8e207f9842310405781f.tar.gz
gentoo-2-6ac0288c2f217309824d8e207f9842310405781f.tar.bz2
gentoo-2-6ac0288c2f217309824d8e207f9842310405781f.zip
Properly fix --as-needed bug.
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/encfs')
-rw-r--r--sys-fs/encfs/ChangeLog8
-rw-r--r--sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch13
2 files changed, 12 insertions, 9 deletions
diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog
index 876fb0f557e8..1f09934a2a95 100644
--- a/sys-fs/encfs/ChangeLog
+++ b/sys-fs/encfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/encfs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.39 2008/12/13 16:50:32 vanquirius Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.40 2009/03/16 08:20:17 dev-zero Exp $
+
+ 16 Mar 2009; Tiziano Müller <dev-zero@gentoo.org>
+ files/encfs-1.5-boost-system-and-as-needed.patch:
+ Properly fix --as-needed bug.
13 Dec 2008; Marcelo Goes <vanquirius@gentoo.org> encfs-1.5.ebuild:
Add autotools magic to deal with broken --as-needed for bug 245782. Thanks
diff --git a/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch b/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch
index 5928f87373bf..9b00259f10b0 100644
--- a/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch
+++ b/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch
@@ -1,21 +1,20 @@
-diff -ru encfs-1.5.orig/encfs/Makefile.am encfs-1.5/encfs/Makefile.am
---- encfs-1.5.orig/encfs/Makefile.am 2008-08-23 17:48:12.000000000 -0400
-+++ encfs-1.5/encfs/Makefile.am 2008-11-09 12:43:21.000000000 -0500
-@@ -3,7 +3,7 @@
+diff -Naur encfs-1.5.orig/encfs/Makefile.am encfs-1.5/encfs/Makefile.am
+--- encfs-1.5.orig/encfs/Makefile.am 2009-03-16 08:11:56.330904107 +0100
++++ encfs-1.5/encfs/Makefile.am 2009-03-16 08:13:13.164266321 +0100
+@@ -3,7 +3,6 @@
ALL_INCLUDES = @RLOG_CFLAGS@ @OPENSSL_CFLAGS@ @BOOST_CPPFLAGS@
ALL_LDFLAGS = @RLOG_LIBS@ @OPENSSL_LIBS@ @FUSE_LIBS@
-ALL_LDFLAGS += @BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@
-+ALL_LDFLAGS += @BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@
INCLUDES = $(all_includes) -I../intl
-@@ -43,7 +43,7 @@
+@@ -43,7 +42,7 @@
# : +1 : => internal changes, nothing breaks
#
libencfs_la_LDFLAGS = -version-info 5:0:1
-libencfs_la_LIBADD = -lrlog
-+libencfs_la_LIBADD = -lrlog @OPENSSL_LIBS@
++libencfs_la_LIBADD = -lrlog @OPENSSL_LIBS@ @BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@
EXTRASRC = ../intl/autosprintf.cpp
if BUILD_OPENSSL