From: Yuta Satoh Date: Thu, 16 Jun 2016 10:29:51 +0000 (+0900) Subject: sys-freebsd/freebsd-sources: Fix the issue that can not build bmake. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=198d3074b5a0bce9280302f11177ed333c3a2ec4;p=gentoo.git sys-freebsd/freebsd-sources: Fix the issue that can not build bmake. --- 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 000000000000..c0ca444b042d --- /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 65202d3b55c1..8c16793d9488 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":' \