diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-05-12 14:59:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-05-12 14:59:29 +0000 |
| commit | 26405b6da7196836943d1d5dd4e15fcaa615924e (patch) | |
| tree | c869f8f6835a119e7b56d7d5061b4efc8e492eb4 /sys-freebsd/freebsd-cddl | |
| parent | build verbose so that we see the actual commands invoked (diff) | |
| download | gentoo-2-26405b6da7196836943d1d5dd4e15fcaa615924e.tar.gz gentoo-2-26405b6da7196836943d1d5dd4e15fcaa615924e.tar.bz2 gentoo-2-26405b6da7196836943d1d5dd4e15fcaa615924e.zip | |
fix installation, bug #414879 and simplify ebuild
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-cddl')
| -rw-r--r-- | sys-freebsd/freebsd-cddl/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild | 23 |
2 files changed, 9 insertions, 19 deletions
diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog index 73634cddcd12..ab2691acce4f 100644 --- a/sys-freebsd/freebsd-cddl/ChangeLog +++ b/sys-freebsd/freebsd-cddl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-freebsd/freebsd-cddl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.21 2012/05/12 07:57:13 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.22 2012/05/12 14:59:29 aballier Exp $ + + 12 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-cddl-9.0.ebuild: + fix installation, bug #414879 and simplify ebuild 12 May 2012; Naohiro Aota <naota@gentoo.org> +files/zvol.initd-9.0, freebsd-cddl-9.0.ebuild: diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild index 0d57fd42ee85..e116fa008a01 100644 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild +++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.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-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.5 2012/05/12 07:57:13 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.6 2012/05/12 14:59:29 aballier Exp $ EAPI=4 @@ -48,23 +48,10 @@ src_unpack() { src_install() { # Install libraries proper place local mylibdir=$(get_libdir) - for d in libavl libctf libdtrace; do - cd "${S}"/lib/$d - mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die - done - for d in libnvpair libumem libuutil libzfs libzpool;do - cd "${S}"/lib/$d - mkinstall SHLIBDIR="/${mylibdir}" LIBDIR="/${mylibdir}" || die - done - for d in lib/drti sbin usr.bin usr.sbin; do - cd "${S}"/$d - mkinstall || die - done - mv "${ED}"/${mylibdir}/lib{nvpair,umem,uutil,zfs}{,_p}.a \ - "${ED}"/${mylibdir}/libzpool.a \ - "${ED}"/usr/${mylibdir} || die - gen_usr_ldscript libnvpair.so libumem.so libuutil.so libzfs.so libzpool.so - # Install zfs volinit script. + mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die + + gen_usr_ldscript -a nvpair umem uutil zfs zpool + # Install zfs volinit script. newinitd "${FILESDIR}"/zvol.initd-9.0 zvol } |