summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-02-27 01:14:13 +0000
committerMike Gilbert <floppym@gentoo.org>2012-02-27 01:14:13 +0000
commit7a0674223794e4beea28ae1bf14828bbbfbc562e (patch)
tree4238933b4c7d2d654c4ce21f61d9b98a523eb62c /sys-fs/zfs
parentUpdates by Richard to resolve bug 405795. Add custom-cflags USE flag. (diff)
downloadhistorical-7a0674223794e4beea28ae1bf14828bbbfbc562e.tar.gz
historical-7a0674223794e4beea28ae1bf14828bbbfbc562e.tar.bz2
historical-7a0674223794e4beea28ae1bf14828bbbfbc562e.zip
Updates by Richard to resolve bug 405795. Add custom-cflags USE flag.
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/ChangeLog5
-rw-r--r--sys-fs/zfs/Manifest10
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild16
3 files changed, 21 insertions, 10 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index a9345cdb3caa..d375ab291e7c 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/zfs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.8 2012/02/24 22:46:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.9 2012/02/27 01:14:13 floppym Exp $
+
+ 27 Feb 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild:
+ Updates by Richard to resolve bug 405795. Add custom-cflags USE flag.
24 Feb 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild:
Updates from Richard Yao for bug 405203.
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 3ff540cb457e..8f784161104f 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD zfs-9999.ebuild 1408 RMD160 fea6ad09b578e816858fd86c7109e9bbd81c584b SHA1 bcc10287f585a9c2ad9af2ede2776afcaf617d41 SHA256 6c65256bcac6fcf4083a9690f2509964d06ad422fd30c937c45d033c4afb4afe
-MISC ChangeLog 1240 RMD160 cc1ed777518f3ff7f401539703f3cab0252727c2 SHA1 ce15d76b40ec5b7c0bfac3367a6730f126147686 SHA256 5aa457432b96dd14a0251f039d53e014c9900a19cd7cf8cad12a2dfb546453ed
+EBUILD zfs-9999.ebuild 1569 RMD160 b2c78205acb938ee3c1b127d3b9a33e65df80d60 SHA1 05914646f6066f4c7617b34c09955c6b572f789b SHA256 97123e018c6097aa45217597e1ab173175778d2bf23bfa8850e6928181a005fe
+MISC ChangeLog 1379 RMD160 363e4723dbf4c3a49694424e986b9144d84d8a13 SHA1 c4adb2858c2f66c0937fb9ffbae8741be2c05ded SHA256 46935dde539f073221716dc0f8b59b7ebc3764f5fb080ff284f9de59e53c0941
MISC metadata.xml 374 RMD160 a315b0ad1a5c228cb9406628cbce49afa38f6f18 SHA1 f33356682408f0f0a177702b4e33660a351973be SHA256 ae971627d7a77740537ab8c64cee66385a19127b8e62ad472374c1c940ae24e8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk9IE0UACgkQC77qH+pIQ6ThKAD9G1szP9lKNBTsecaAY2WOAHEi
-qaGRZ8DOUEH4lPGo8gEBAIjoYZMMB+Yph82qDSWxL+bkJt1QbdHdbqZ/2/clnNyP
-=LWjh
+iF4EAREIAAYFAk9K2OsACgkQC77qH+pIQ6RmGQEAiakvAFgh/D74dmJWqjVWE/bD
+u/uSjvjncy47q+naotYA/3lmurWPhidLJks0XehQqgkJzMU8TRTdQBK5/1hsL2kg
+=cG0B
-----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 673570e619ac..6a5b6d467c8e 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.8 2012/02/24 22:46:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.9 2012/02/27 01:14:13 floppym Exp $
EAPI="4"
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
LICENSE="CDDL GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug static-libs"
+IUSE="custom-cflags debug static-libs"
DEPEND=">=sys-kernel/spl-${PV}"
RDEPEND="${DEPEND}
@@ -27,7 +27,8 @@ AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"
pkg_setup() {
- CONFIG_CHECK="!PREEMPT
+ CONFIG_CHECK="MODULES
+ !PREEMPT
!DEBUG_LOCK_ALLOC
ZLIB_DEFLATE
ZLIB_INFLATE
@@ -43,9 +44,11 @@ src_prepare() {
}
src_configure() {
+ use custom-cflags || strip-flags
set_arch_to_kernel
local myeconfargs=(
- --exec-prefix=
+ --bin=/bin
+ --sbin=/sbin
--with-config=all
--with-linux="${KV_DIR}"
--with-linux-obj="${KV_OUT_DIR}"
@@ -64,3 +67,8 @@ src_test() {
autotools-utils_src_test
fi
}
+
+src_install() {
+ autotools-utils_src_install
+ gen_usr_ldscript -a uutil nvpair zpool zfs
+}