commit: 198d3074b5a0bce9280302f11177ed333c3a2ec4
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Thu Jun 16 10:29:51 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 10:29:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198d3074
sys-freebsd/freebsd-sources: Fix the issue that can not build bmake.
.../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 +++++++++++++
sys-freebsd/freebsd-sources/freebsd-sources-10.3-r3.ebuild | 4 ++++
2 files changed, 17 insertions(+)
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
new file mode 100644
index 0000000..c0ca444
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch
@@ -0,0 +1,13 @@
+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-10.3-r3.ebuild
b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r3.ebuild
index 65202d3..8c16793 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r3.ebuild
@@ -71,6 +71,10 @@ 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":' \
