1 |
commit: d4f500fb2c9ed2de0e5a64d79f444e0b852e099a |
2 |
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 2 13:07:44 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 2 16:51:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f500fb |
7 |
|
8 |
sys-freebsd/freebsd-sources: remove unused code. |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
.../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 ------------- |
13 |
.../freebsd-sources/freebsd-sources-11.1_p2.ebuild | 17 ++--------------- |
14 |
2 files changed, 2 insertions(+), 28 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index c0ca444b042..00000000000 |
19 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch |
20 |
+++ /dev/null |
21 |
@@ -1,13 +0,0 @@ |
22 |
-diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile |
23 |
-index 6c6d8c2..22fec7a 100644 |
24 |
---- a/usr.bin/bmake/Makefile |
25 |
-+++ b/usr.bin/bmake/Makefile |
26 |
-@@ -5,7 +5,7 @@ |
27 |
- |
28 |
- .sinclude "Makefile.inc" |
29 |
- |
30 |
--SRCTOP?= ${.CURDIR:H:H} |
31 |
-+SRCTOP= ${.CURDIR:H:H} |
32 |
- |
33 |
- # look here first for config.h |
34 |
- CFLAGS+= -I${.CURDIR} |
35 |
|
36 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild |
37 |
index 9e5d7d77934..b4d22b6fc70 100644 |
38 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild |
39 |
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild |
40 |
@@ -1,4 +1,4 @@ |
41 |
-# Copyright 1999-2017 Gentoo Foundation |
42 |
+# Copyright 1999-2018 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
EAPI=5 |
46 |
@@ -23,11 +23,7 @@ if [[ ${PV} != *9999* ]]; then |
47 |
$(freebsd_upstream_patches)" |
48 |
fi |
49 |
|
50 |
-EXTRACTONLY=" |
51 |
- sys/ |
52 |
- contrib/bmake/ |
53 |
- usr.bin/bmake/ |
54 |
-" |
55 |
+EXTRACTONLY="sys/" |
56 |
|
57 |
RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
58 |
=sys-freebsd/freebsd-mk-defs-${RV}* |
59 |
@@ -68,10 +64,6 @@ pkg_setup() { |
60 |
src_prepare() { |
61 |
local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" |
62 |
|
63 |
- cd "${WORKDIR}" || die |
64 |
- epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch" |
65 |
- cd "${S}" || die |
66 |
- |
67 |
# This replaces the gentoover patch, it doesn't need reapply every time. |
68 |
sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ |
69 |
-e 's:^BRANCH=.*:BRANCH="Gentoo":' \ |
70 |
@@ -115,11 +107,6 @@ src_configure() { |
71 |
|
72 |
src_compile() { |
73 |
if use build-kernel ; then |
74 |
- if has_version "<sys-freebsd/freebsd-ubin-10.0"; then |
75 |
- cd "${WORKDIR}"/usr.bin/bmake || die |
76 |
- CC=${CHOST}-gcc freebsd_src_compile |
77 |
- export BMAKE="${WORKDIR}/usr.bin/bmake/make" |
78 |
- fi |
79 |
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
80 |
freebsd_src_compile depend |
81 |
freebsd_src_compile |