diff options
author | 2013-08-14 17:33:34 +0000 | |
---|---|---|
committer | 2013-08-14 17:33:34 +0000 | |
commit | 808b50bdc082c2ef18c249b856292d2d8fc37cba (patch) | |
tree | 31dee1edc56ae00280337339e8396d4881322e66 /sys-freebsd/freebsd-sources | |
parent | Depend on harfbuzz[icu], bug #481054 by Mikael Magnusson (diff) | |
download | gentoo-2-808b50bdc082c2ef18c249b856292d2d8fc37cba.tar.gz gentoo-2-808b50bdc082c2ef18c249b856292d2d8fc37cba.tar.bz2 gentoo-2-808b50bdc082c2ef18c249b856292d2d8fc37cba.zip |
Make dtrace (and CDDL) support optional, bug #481024 by Yuta SATOH
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd/freebsd-sources')
-rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 6 | ||||
-rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild | 17 | ||||
-rw-r--r-- | sys-freebsd/freebsd-sources/metadata.xml | 1 |
3 files changed, 16 insertions, 8 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index a090044456c1..36aa5aec1ebe 100644 --- a/sys-freebsd/freebsd-sources/ChangeLog +++ b/sys-freebsd/freebsd-sources/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-sources # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.96 2013/08/12 15:05:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.97 2013/08/14 17:33:34 aballier Exp $ + + 14 Aug 2013; Alexis Ballier <aballier@gentoo.org> + freebsd-sources-9.2_rc1.ebuild, metadata.xml: + Make dtrace (and CDDL) support optional, bug #481024 by Yuta SATOH 12 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.2_rc1.ebuild: diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild index fca4feb4f15b..4e8579908ce9 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.6 2013/08/12 15:05:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.7 2013/08/14 17:33:34 aballier Exp $ EAPI=5 @@ -9,19 +9,19 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs DESCRIPTION="FreeBSD kernel sources" SLOT="0" -IUSE="+build-generic profile" +IUSE="+build-generic dtrace profile" if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SRC_URI="mirror://gentoo/${SYS}.tar.bz2" fi -RDEPEND="=sys-freebsd/freebsd-cddl-${RV}* +RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-defs-${RV}* !sys-freebsd/virtio-kmod" DEPEND="build-generic? ( - =sys-freebsd/freebsd-cddl-${RV}* - =sys-freebsd/freebsd-usbin-${RV}* + dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) + >=sys-freebsd/freebsd-usbin-9.1 =sys-freebsd/freebsd-mk-defs-${RV}* )" @@ -74,9 +74,12 @@ src_configure() { src_compile() { if use build-generic ; then + local myconf + use dtrace || myconf="-DNO_CTF " + cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die - freebsd_src_compile depend - freebsd_src_compile + freebsd_src_compile depend ${myconf} + freebsd_src_compile ${myconf} else einfo "Nothing to compile.." fi diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml index 4915b9b948f7..bbbd6a5993df 100644 --- a/sys-freebsd/freebsd-sources/metadata.xml +++ b/sys-freebsd/freebsd-sources/metadata.xml @@ -4,5 +4,6 @@ <herd>bsd</herd> <use> <flag name='build-generic'>Build and install a generic kernel (recommended).</flag> + <flag name='dtrace'>Enable DTrace support.</flag> </use> </pkgmetadata> |