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