--- freebsd-sources-9.2_rc3.ebuild 2013-08-27 05:45:33.000000000 +0900 +++ freebsd-sources-10.0_beta1.ebuild 2013-10-16 20:45:21.000000000 +0900 @@ -9,17 +9,20 @@ DESCRIPTION="FreeBSD kernel sources" SLOT="0" -IUSE="+build-generic dtrace profile" +IUSE="+build-generic +clang debug dtrace profile zfs" if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SRC_URI="mirror://gentoo/${SYS}.tar.bz2" fi -RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) +RDEPEND="clang? ( sys-devel/clang ) + dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-defs-${RV}* - !sys-freebsd/virtio-kmod" + !sys-freebsd/virtio-kmod + !sys-fs/fuse4bsd" DEPEND="build-generic? ( + clang? ( sys-devel/clang ) dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) >=sys-freebsd/freebsd-usbin-9.1 =sys-freebsd/freebsd-mk-defs-${RV}* @@ -29,12 +32,11 @@ S="${WORKDIR}/sys" -KERN_BUILD=GENERIC +KERN_BUILD=GENTOO PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" - "${FILESDIR}/${PN}-9.2-gentoo.patch" + "${FILESDIR}/${PN}-10.0-gentoo.patch" "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - "${FILESDIR}/${PN}-6.1-ntfs.patch" "${FILESDIR}/${PN}-7.1-types.h-fix.patch" "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" "${FILESDIR}/${PN}-7.1-includes.patch" @@ -42,7 +44,15 @@ "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" ) +pkg_setup() { + # Force set CC=clang. when using gcc, aesni fails to build. + use clang && export CC=clang + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL=" +} + src_prepare() { + local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" + # This replaces the gentoover patch, it doesn't need reapply every time. sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ @@ -50,8 +60,8 @@ "${S}/conf/newvers.sh" # __FreeBSD_cc_version comes from FreeBSD's gcc. - # on 9.0-RELEASE it's 900001. - sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \ + # on 10.0-RELEASE it's 1000001. + sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \ -i "${S}/conf/kern.pre.mk" \ -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" @@ -60,6 +70,11 @@ -i "${S}/conf/kern.pre.mk" \ -i "${S}/conf/kmod.mk" || die + # Set the kernel configuration using USE flags. + cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die + use debug || echo 'nomakeoptions DEBUG' >> "${conf}" + use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" + # Only used with USE=build-generic, let the kernel build with its own flags, its safer. unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL } @@ -74,12 +89,9 @@ 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 ${myconf} - freebsd_src_compile ${myconf} + freebsd_src_compile depend + freebsd_src_compile else einfo "Nothing to compile.." fi