commit: d4f500fb2c9ed2de0e5a64d79f444e0b852e099a
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Tue Jan 2 13:07:44 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 16:51:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f500fb
sys-freebsd/freebsd-sources: remove unused code.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
.../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 -------------
.../freebsd-sources/freebsd-sources-11.1_p2.ebuild | 17 ++---------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git
a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch
b/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch
deleted file mode 100644
index c0ca444b042..00000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
-index 6c6d8c2..22fec7a 100644
---- a/usr.bin/bmake/Makefile
-+++ b/usr.bin/bmake/Makefile
-@@ -5,7 +5,7 @@
-
- .sinclude "Makefile.inc"
-
--SRCTOP?= ${.CURDIR:H:H}
-+SRCTOP= ${.CURDIR:H:H}
-
- # look here first for config.h
- CFLAGS+= -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
index 9e5d7d77934..b4d22b6fc70 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -23,11 +23,7 @@ if [[ ${PV} != *9999* ]]; then
$(freebsd_upstream_patches)"
fi
-EXTRACTONLY="
- sys/
- contrib/bmake/
- usr.bin/bmake/
-"
+EXTRACTONLY="sys/"
RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
=sys-freebsd/freebsd-mk-defs-${RV}*
@@ -68,10 +64,6 @@ pkg_setup() {
src_prepare() {
local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
- cd "${WORKDIR}" || die
- epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch"
- cd "${S}" || die
-
# This replaces the gentoover patch, it doesn't need reapply every time.
sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
@@ -115,11 +107,6 @@ src_configure() {
src_compile() {
if use build-kernel ; then
- if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
- cd "${WORKDIR}"/usr.bin/bmake || die
- CC=${CHOST}-gcc freebsd_src_compile
- export BMAKE="${WORKDIR}/usr.bin/bmake/make"
- fi
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
freebsd_src_compile depend
freebsd_src_compile
