summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-14 17:33:41 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-14 17:33:41 +0000
commit87c25119249128590356182cde22b77ca8300129 (patch)
tree1ffef9eb5ec259229a42e4ad27143d0ba07398b4 /sys-freebsd
parentDepend on harfbuzz[icu], bug #481054 by Mikael Magnusson (diff)
downloadhistorical-87c25119249128590356182cde22b77ca8300129.tar.gz
historical-87c25119249128590356182cde22b77ca8300129.tar.bz2
historical-87c25119249128590356182cde22b77ca8300129.zip
Make dtrace (and CDDL) support optional, bug #481024 by Yuta SATOH
Package-Manager: portage-2.2.0/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-sources/ChangeLog6
-rw-r--r--sys-freebsd/freebsd-sources/Manifest12
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild17
-rw-r--r--sys-freebsd/freebsd-sources/metadata.xml1
4 files changed, 22 insertions, 14 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/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 4d34a4d6a93e..f9f1c68af853 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -26,13 +26,13 @@ DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c
DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cfe542049014e9bdc4de0990aba539b7518 SHA512 ab7e6301180560934da38a3ef1de3623f0e42c6ee5ba2695754784c5af80ab8367b5d5412bbee51e8ba963b7f5835be9c3789b66b33be338bb9194a9de15b2eb WHIRLPOOL 7afbf758f0a02ea0337b58dd8f12876b8b58dbf73d8a3c237e1bfe2c77b72f319080d91a52ef2918e2c133af5924b302712fcc76ebe2cb334c561f18511698b1
EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
EBUILD freebsd-sources-9.1-r3.ebuild 2648 SHA256 40075f5d40a1f1d1cb53cce9fba58a45cfdf3fc358b379ff5f502bda21e7c010 SHA512 f51c6eb2d56f8207ecf77ccd7630e5fa3c78db6d30bf21dc84d0c602643a68e0b10e67824c161b198a8d1311ad34543ec5ec1c71008c86c21b71c9e05a417272 WHIRLPOOL 9c5f574e177e52cca80466f51a27fa6341c29db4970a70e0d9ab26a76e66328fac70c0ce99df63d2ed8ee26f6153da9f1a4a94c76f1a0aa792094e19e3524e00
-EBUILD freebsd-sources-9.2_rc1.ebuild 3042 SHA256 2911241945fcc1e0b1efc3fb4162fb11a952701b4700618f3a7104ce3a179418 SHA512 d37456527380fb3f0f1d95277ed582d0ec989998f7925d10c496bd6517e830096270ca13303061fe96d4c670d25d6aa2b8f9867cafa31d87e17342e648847748 WHIRLPOOL c1dae9bec371aecf6dd1c4bd74afc0e5f139d64fd2720ae27274550f2f7aea2163227ca1d492fe23ff09d67733f081d11c223ebe8627a84f7b65de248568cb18
-MISC ChangeLog 24524 SHA256 1a0c0441ea0aa75b2812c5e98c641e540b8018135a5b9c93224e8f1c5b4232d8 SHA512 b4b9912b0829635a2bd77bafb4a99831426371a3b34a27404a2adcd5a7689d7ec910bd58a188d002a5de789c6b578e767c99c12fa25379ccdf3f97d7c3b20616 WHIRLPOOL 499648ba54cd0f8eeb6480ed96c72d4d8400f9ab6c5ad7146a6e5c6bbb335b370b75bf78ac424853b996415d473703521926a7a10b4ecb42c101399952e655c0
-MISC metadata.xml 261 SHA256 f2a21c21a5bdd227265679eafeaf6758923723ee562e79618f548cdc77472c88 SHA512 845e7613a39fad782c5cd33dd0ddc7b42132f3a0027ae9538f75cc729d613bdf032f623aadf5ec0ab8d08bff7b58c0d7edbf05819cbbccddb2dbf054a16f9c1f WHIRLPOOL 6a798d4dcabfa29cc603a191cdc30c07c8fc850116558b5e71b59393138ff1491d46a1496af356d4fb5077746ca48cb9c76dc0b9c37d0b57b8768c85d37a1a10
+EBUILD freebsd-sources-9.2_rc1.ebuild 3146 SHA256 a5ff139aa2daf1ee0f7294195b26ac0e3b39c9bab9c25c3bcb2fa361a609bb9b SHA512 a2e9a234d522d858f1a0b5a6ffd26a4742319d36d6034bb2f1d79b343fdc3b67eddda62c38214760ca347a0308685526cbf45149d418bea2e2fe994efa58a30a WHIRLPOOL 02bb6b335165e85597f1227a63cdc55bc7df796819764a74623764e44ec09098cedec2750c3b21d053cfd36acf11eea2a0b19808c858afd4882d82947f2c33e3
+MISC ChangeLog 24694 SHA256 ce57b03bd9682c366ca2ea874a041c162ae12cd3510e289fb20861ed7ea8c18c SHA512 61fcdf0062e42a892848840cb46e20f4a24e3706dca058b0f8fd9ec31a8d61a75d8a641a414b30393b18c66d3237f5e12f95051f5df0bf54041826f0c08c5912 WHIRLPOOL efae16c020f533ad0b7724c845c4259fa9fb667d663c390f97dfe089217629a80a64663ba5df1e8ab841989146cadbe5046dd1c2a31d60a7e6737f04efa303d8
+MISC metadata.xml 315 SHA256 d827e7310cb93578d5712b15f74a56b5cd98854e350fbc29a17dad0222ee955e SHA512 f8dc2ef7a14a4c3c34136b313802e982d57c606d3aa47fc51c59cd3840ebb9df3db17f40176354348e154891027477f97da6d72a3723613334ffe7852ea5bbd3 WHIRLPOOL 88483c7555215eda8091f4adcd9148a1079307a7ada08f6caa45bb482aa6dbbee291c96e24b4a35f915c944803fafaed1a6a8c85fc899071eb9f577f4e80049c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlII+coACgkQvFcC4BYPU0qw7gCgyE250feGPxsIQr4R6Enzf11u
-PswAniwwGlCSKOdkrbbE2EWfXhIScaoq
-=OiOG
+iEYEAREIAAYFAlILv28ACgkQvFcC4BYPU0oF1QCeMxyY6ihNmlSOg7EQAFitdjjp
+O98AoIaFFZCyjZtRZfGV1cvMr8ap5Q5f
+=UXK2
-----END PGP SIGNATURE-----
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>