Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/releases/freebsd-11.0/, profiles/default/bsd/fbsd/amd64/11.0/clang/, ...
Date: Tue, 11 Oct 2016 14:48:35
Message-Id: 1476197266.a62054a4737e02d96b041ff3aa353cc793eae89e.aballier@gentoo
1 commit: a62054a4737e02d96b041ff3aa353cc793eae89e
2 Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
3 AuthorDate: Tue Oct 11 12:11:47 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 11 14:47:46 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62054a4
7
8 profiles: added FreeBSD 11.0 profile and activated.
9
10 profiles/default/bsd/fbsd/amd64/11.0/clang/parent | 2 +
11 profiles/default/bsd/fbsd/amd64/11.0/eapi | 1 +
12 profiles/default/bsd/fbsd/amd64/11.0/make.defaults | 7 ++++
13 .../default/bsd/fbsd/amd64/11.0/package.use.force | 2 +
14 profiles/default/bsd/fbsd/amd64/11.0/parent | 2 +
15 profiles/default/bsd/fbsd/x86/11.0/eapi | 1 +
16 profiles/default/bsd/fbsd/x86/11.0/make.defaults | 6 +++
17 profiles/default/bsd/fbsd/x86/11.0/parent | 2 +
18 profiles/profiles.desc | 3 ++
19 profiles/releases/freebsd-11.0/package.mask | 48 ++++++++++++++++++++++
20 profiles/releases/freebsd-11.0/package.use.force | 6 +++
21 profiles/releases/freebsd-11.0/packages | 10 +++++
22 profiles/releases/freebsd-11.0/packages.build | 7 ++++
23 profiles/releases/freebsd-11.0/parent | 1 +
24 profiles/releases/freebsd-11.0/profile.bashrc | 34 +++++++++++++++
25 15 files changed, 132 insertions(+)
26
27 diff --git a/profiles/default/bsd/fbsd/amd64/11.0/clang/parent b/profiles/default/bsd/fbsd/amd64/11.0/clang/parent
28 new file mode 100644
29 index 00000000..7dbda40
30 --- /dev/null
31 +++ b/profiles/default/bsd/fbsd/amd64/11.0/clang/parent
32 @@ -0,0 +1,2 @@
33 +..
34 +../../../../../../arch/amd64-fbsd/clang
35
36 diff --git a/profiles/default/bsd/fbsd/amd64/11.0/eapi b/profiles/default/bsd/fbsd/amd64/11.0/eapi
37 new file mode 100644
38 index 00000000..7ed6ff8
39 --- /dev/null
40 +++ b/profiles/default/bsd/fbsd/amd64/11.0/eapi
41 @@ -0,0 +1 @@
42 +5
43
44 diff --git a/profiles/default/bsd/fbsd/amd64/11.0/make.defaults b/profiles/default/bsd/fbsd/amd64/11.0/make.defaults
45 new file mode 100644
46 index 00000000..9ab2941
47 --- /dev/null
48 +++ b/profiles/default/bsd/fbsd/amd64/11.0/make.defaults
49 @@ -0,0 +1,7 @@
50 +# Copyright 1999-2016 Gentoo Foundation.
51 +# Distributed under the terms of the GNU General Public License, v2
52 +# $Id$
53 +
54 +CHOST="x86_64-gentoo-freebsd11.0"
55 +CHOST_amd64_fbsd="x86_64-gentoo-freebsd11.0"
56 +CHOST_x86_fbsd="i686-gentoo-freebsd11.0"
57
58 diff --git a/profiles/default/bsd/fbsd/amd64/11.0/package.use.force b/profiles/default/bsd/fbsd/amd64/11.0/package.use.force
59 new file mode 100644
60 index 00000000..c80eeb6
61 --- /dev/null
62 +++ b/profiles/default/bsd/fbsd/amd64/11.0/package.use.force
63 @@ -0,0 +1,2 @@
64 +# >=dev-lang/python-3.2 requires threads, #494744
65 +=dev-lang/python-3* threads
66
67 diff --git a/profiles/default/bsd/fbsd/amd64/11.0/parent b/profiles/default/bsd/fbsd/amd64/11.0/parent
68 new file mode 100644
69 index 00000000..7d235ae
70 --- /dev/null
71 +++ b/profiles/default/bsd/fbsd/amd64/11.0/parent
72 @@ -0,0 +1,2 @@
73 +..
74 +../../../../../releases/freebsd-11.0
75
76 diff --git a/profiles/default/bsd/fbsd/x86/11.0/eapi b/profiles/default/bsd/fbsd/x86/11.0/eapi
77 new file mode 100644
78 index 00000000..7ed6ff8
79 --- /dev/null
80 +++ b/profiles/default/bsd/fbsd/x86/11.0/eapi
81 @@ -0,0 +1 @@
82 +5
83
84 diff --git a/profiles/default/bsd/fbsd/x86/11.0/make.defaults b/profiles/default/bsd/fbsd/x86/11.0/make.defaults
85 new file mode 100644
86 index 00000000..5a1bf10
87 --- /dev/null
88 +++ b/profiles/default/bsd/fbsd/x86/11.0/make.defaults
89 @@ -0,0 +1,6 @@
90 +# Copyright 1999-2016 Gentoo Foundation.
91 +# Distributed under the terms of the GNU General Public License, v2
92 +# $Id$
93 +
94 +CHOST="i686-gentoo-freebsd11.0"
95 +CHOST_x86_fbsd="${CHOST}"
96
97 diff --git a/profiles/default/bsd/fbsd/x86/11.0/parent b/profiles/default/bsd/fbsd/x86/11.0/parent
98 new file mode 100644
99 index 00000000..7d235ae
100 --- /dev/null
101 +++ b/profiles/default/bsd/fbsd/x86/11.0/parent
102 @@ -0,0 +1,2 @@
103 +..
104 +../../../../../releases/freebsd-11.0
105
106 diff --git a/profiles/profiles.desc b/profiles/profiles.desc
107 index 4b1f0c8..613d460 100644
108 --- a/profiles/profiles.desc
109 +++ b/profiles/profiles.desc
110 @@ -175,11 +175,14 @@ x86 default/linux/x86/13.0/systemd stable
111 # Gentoo/FreeBSD Profiles
112 amd64-fbsd default/bsd/fbsd/amd64/9.1 dev
113 amd64-fbsd default/bsd/fbsd/amd64/10.3 dev
114 +amd64-fbsd default/bsd/fbsd/amd64/11.0 dev
115 amd64-fbsd default/bsd/fbsd/amd64/9.1/clang exp
116 amd64-fbsd default/bsd/fbsd/amd64/10.3/clang exp
117 +amd64-fbsd default/bsd/fbsd/amd64/11.0/clang exp
118 sparc-fbsd default/bsd/fbsd/sparc/8.2 exp
119 x86-fbsd default/bsd/fbsd/x86/9.1 dev
120 x86-fbsd default/bsd/fbsd/x86/10.3 dev
121 +x86-fbsd default/bsd/fbsd/x86/11.0 dev
122
123 # Hardened Profiles
124 amd64 hardened/linux/amd64 stable
125
126 diff --git a/profiles/releases/freebsd-11.0/package.mask b/profiles/releases/freebsd-11.0/package.mask
127 new file mode 100644
128 index 00000000..1a52a8b
129 --- /dev/null
130 +++ b/profiles/releases/freebsd-11.0/package.mask
131 @@ -0,0 +1,48 @@
132 +# Copyright 1999-2016 Gentoo Foundation.
133 +# Distributed under the terms of the GNU General Public License, v2
134 +# $Id$
135 +
136 +# Make sure we don't get wrong versions
137 +<sys-freebsd/freebsd-pam-modules-11.0_alpha
138 +>sys-freebsd/freebsd-pam-modules-11.0.99
139 +<sys-freebsd/freebsd-rescue-11.0_alpha
140 +>sys-freebsd/freebsd-rescue-11.0.99
141 +<sys-freebsd/freebsd-pf-11.0_alpha
142 +>sys-freebsd/freebsd-pf-11.0.99
143 +<sys-freebsd/freebsd-mk-defs-11.0_alpha
144 +>sys-freebsd/freebsd-mk-defs-11.0.99
145 +<sys-freebsd/freebsd-lib-11.0_alpha
146 +>sys-freebsd/freebsd-lib-11.0.99
147 +<sys-freebsd/freebsd-libexec-11.0_alpha
148 +>sys-freebsd/freebsd-libexec-11.0.99
149 +<sys-freebsd/freebsd-bin-11.0_alpha
150 +>sys-freebsd/freebsd-bin-11.0.99
151 +<sys-freebsd/freebsd-sbin-11.0_alpha
152 +>sys-freebsd/freebsd-sbin-11.0.99
153 +<sys-freebsd/freebsd-ubin-11.0_alpha
154 +>sys-freebsd/freebsd-ubin-11.0.99
155 +>sys-freebsd/freebsd-usbin-11.0.99
156 +<sys-freebsd/freebsd-share-11.0_alpha
157 +>sys-freebsd/freebsd-share-11.0.99
158 +<sys-freebsd/freebsd-contrib-11.0_alpha
159 +>sys-freebsd/freebsd-contrib-11.0.99
160 +>sys-freebsd/freebsd-cddl-11.0.99
161 +<sys-freebsd/boot0-11.0_alpha
162 +>sys-freebsd/boot0-11.0.99
163 +<sys-freebsd/freebsd-sources-11.0_alpha
164 +>sys-freebsd/freebsd-sources-11.0.99
165 +
166 +# Mask version of -cddl and -usbin is different for ease of upgrade. bug #491774
167 +# Please keep <freebsd-cddl-9.2_alpha and <freebsd-usbin-9.1_alpha.
168 +<sys-freebsd/freebsd-cddl-9.2_alpha
169 +<sys-freebsd/freebsd-usbin-9.1_alpha
170 +
171 +# Alexis Ballier <aballier@g.o> (07 Nov 2011)
172 +# It is in freebsd-ubin starting from FreeBSD 9.0
173 +sys-process/fuser-bsd
174 +
175 +# Alexis Ballier <aballier@g.o> (11 May 2012)
176 +# freebsd-lib provides a utempter compatible interface starting from FreeBSD 9.0
177 +# via libulog.
178 +# this package does not build anymore as it requires utmp
179 +sys-libs/libutempter
180
181 diff --git a/profiles/releases/freebsd-11.0/package.use.force b/profiles/releases/freebsd-11.0/package.use.force
182 new file mode 100644
183 index 00000000..88079d4
184 --- /dev/null
185 +++ b/profiles/releases/freebsd-11.0/package.use.force
186 @@ -0,0 +1,6 @@
187 +# Copyright 1999-2016 Gentoo Foundation.
188 +# Distributed under the terms of the GNU General Public License, v2
189 +# $Id$
190 +
191 +# freebsd-sources[build-generic] requires clang
192 +sys-devel/llvm clang
193
194 diff --git a/profiles/releases/freebsd-11.0/packages b/profiles/releases/freebsd-11.0/packages
195 new file mode 100644
196 index 00000000..bb97d59
197 --- /dev/null
198 +++ b/profiles/releases/freebsd-11.0/packages
199 @@ -0,0 +1,10 @@
200 +# Copyright 1999-2016 Gentoo Foundation.
201 +# Distributed under the terms of the GNU General Public License, v2
202 +# $Id$
203 +
204 +*>=sys-apps/baselayout-2.0.0
205 +*>=sys-apps/openrc-0.2.5
206 +
207 +# Not necessary dev-libs/libiconv and freebsd-contrib in 10.0 and later.
208 +-*dev-libs/libiconv
209 +-*sys-freebsd/freebsd-contrib
210
211 diff --git a/profiles/releases/freebsd-11.0/packages.build b/profiles/releases/freebsd-11.0/packages.build
212 new file mode 100644
213 index 00000000..4609b99
214 --- /dev/null
215 +++ b/profiles/releases/freebsd-11.0/packages.build
216 @@ -0,0 +1,7 @@
217 +# Copyright 1999-2016 Gentoo Foundation.
218 +# Distributed under the terms of the GNU General Public License v2
219 +# $Id$
220 +
221 +-dev-libs/libiconv
222 +-sys-freebsd/freebsd-contrib
223 +sys-freebsd/freebsd-share
224
225 diff --git a/profiles/releases/freebsd-11.0/parent b/profiles/releases/freebsd-11.0/parent
226 new file mode 100644
227 index 00000000..f3229c5b
228 --- /dev/null
229 +++ b/profiles/releases/freebsd-11.0/parent
230 @@ -0,0 +1 @@
231 +..
232
233 diff --git a/profiles/releases/freebsd-11.0/profile.bashrc b/profiles/releases/freebsd-11.0/profile.bashrc
234 new file mode 100644
235 index 00000000..24394f9
236 --- /dev/null
237 +++ b/profiles/releases/freebsd-11.0/profile.bashrc
238 @@ -0,0 +1,34 @@
239 +# Copyright 1999-2016 Gentoo Foundation.
240 +# Distributed under the terms of the GNU General Public License, v2
241 +# $Id$
242 +
243 +bsd-fbsd10fix(){
244 + # http://svnweb.freebsd.org/ports/head/Mk/bsd.port.mk
245 +
246 + for f in `find ${WORKDIR} -type f \( -name config.libpath -o \
247 + -name config.rpath -o -name configure -o -name libtool.m4 -o \
248 + -name ltconfig -o -name libtool -o -name aclocal.m4 -o \
249 + -name acinclude.m4 \)` ; do \
250 + sed -i.fbsd10bak \
251 + -e 's|freebsd1\*)|freebsd1.\*)|g' \
252 + -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \
253 + -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \
254 + -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \
255 + -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \
256 + ${f} ; \
257 + touch -mr ${f}.fbsd10bak ${f} ; \
258 + rm -f ${f}.fbsd10bak ; \
259 + einfo "===> FreeBSD 10 autotools fix applied to ${f}"; \
260 + done
261 +}
262 +
263 +if [[ -n $EAPI ]] ; then
264 + case "$EAPI" in
265 + 0|1)
266 + post_src_unpack() { bsd-patch_install-sh ; bsd-fbsd10fix ; }
267 + ;;
268 + *)
269 + post_src_prepare() { bsd-patch_install-sh ; bsd-fbsd10fix ; }
270 + ;;
271 + esac
272 +fi