commit: 29b385e9e5029880c0c71c2e07cc200e5cb8edda Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> AuthorDate: Mon Sep 18 11:39:08 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Oct 2 08:56:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b385e9
profiles: add Gentoo/FreeBSD 11.1 profile. profiles/default/bsd/fbsd/amd64/11.1/clang/parent | 2 + profiles/default/bsd/fbsd/amd64/11.1/eapi | 1 + profiles/default/bsd/fbsd/amd64/11.1/make.defaults | 6 +++ profiles/default/bsd/fbsd/amd64/11.1/parent | 2 + profiles/default/bsd/fbsd/x86/11.1/eapi | 1 + profiles/default/bsd/fbsd/x86/11.1/make.defaults | 5 +++ profiles/default/bsd/fbsd/x86/11.1/parent | 2 + profiles/profiles.desc | 3 ++ profiles/releases/freebsd-11.1/package.mask | 47 ++++++++++++++++++++++ profiles/releases/freebsd-11.1/package.use.force | 5 +++ profiles/releases/freebsd-11.1/packages | 12 ++++++ profiles/releases/freebsd-11.1/packages.build | 7 ++++ profiles/releases/freebsd-11.1/parent | 1 + profiles/releases/freebsd-11.1/profile.bashrc | 33 +++++++++++++++ 14 files changed, 127 insertions(+) diff --git a/profiles/default/bsd/fbsd/amd64/11.1/clang/parent b/profiles/default/bsd/fbsd/amd64/11.1/clang/parent new file mode 100644 index 00000000000..7dbda405f0a --- /dev/null +++ b/profiles/default/bsd/fbsd/amd64/11.1/clang/parent @@ -0,0 +1,2 @@ +.. +../../../../../../arch/amd64-fbsd/clang diff --git a/profiles/default/bsd/fbsd/amd64/11.1/eapi b/profiles/default/bsd/fbsd/amd64/11.1/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/profiles/default/bsd/fbsd/amd64/11.1/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/bsd/fbsd/amd64/11.1/make.defaults b/profiles/default/bsd/fbsd/amd64/11.1/make.defaults new file mode 100644 index 00000000000..eaafeb7a93f --- /dev/null +++ b/profiles/default/bsd/fbsd/amd64/11.1/make.defaults @@ -0,0 +1,6 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +CHOST="x86_64-gentoo-freebsd11.1" +CHOST_amd64_fbsd="x86_64-gentoo-freebsd11.1" +CHOST_x86_fbsd="i686-gentoo-freebsd11.1" diff --git a/profiles/default/bsd/fbsd/amd64/11.1/parent b/profiles/default/bsd/fbsd/amd64/11.1/parent new file mode 100644 index 00000000000..317f8c857ad --- /dev/null +++ b/profiles/default/bsd/fbsd/amd64/11.1/parent @@ -0,0 +1,2 @@ +.. +../../../../../releases/freebsd-11.1 diff --git a/profiles/default/bsd/fbsd/x86/11.1/eapi b/profiles/default/bsd/fbsd/x86/11.1/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/profiles/default/bsd/fbsd/x86/11.1/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/bsd/fbsd/x86/11.1/make.defaults b/profiles/default/bsd/fbsd/x86/11.1/make.defaults new file mode 100644 index 00000000000..df595c8a018 --- /dev/null +++ b/profiles/default/bsd/fbsd/x86/11.1/make.defaults @@ -0,0 +1,5 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +CHOST="i686-gentoo-freebsd11.1" +CHOST_x86_fbsd="${CHOST}" diff --git a/profiles/default/bsd/fbsd/x86/11.1/parent b/profiles/default/bsd/fbsd/x86/11.1/parent new file mode 100644 index 00000000000..317f8c857ad --- /dev/null +++ b/profiles/default/bsd/fbsd/x86/11.1/parent @@ -0,0 +1,2 @@ +.. +../../../../../releases/freebsd-11.1 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index fc5e8c6a6ec..9523ae50bce 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -151,13 +151,16 @@ x86 default/linux/x86/13.0/systemd stable amd64-fbsd default/bsd/fbsd/amd64/9.1 dev amd64-fbsd default/bsd/fbsd/amd64/10.3 dev amd64-fbsd default/bsd/fbsd/amd64/11.0 dev +amd64-fbsd default/bsd/fbsd/amd64/11.1 dev amd64-fbsd default/bsd/fbsd/amd64/9.1/clang exp amd64-fbsd default/bsd/fbsd/amd64/10.3/clang exp amd64-fbsd default/bsd/fbsd/amd64/11.0/clang exp +amd64-fbsd default/bsd/fbsd/amd64/11.1/clang exp sparc-fbsd default/bsd/fbsd/sparc/8.2 exp x86-fbsd default/bsd/fbsd/x86/9.1 dev x86-fbsd default/bsd/fbsd/x86/10.3 dev x86-fbsd default/bsd/fbsd/x86/11.0 dev +x86-fbsd default/bsd/fbsd/x86/11.1 dev # Hardened Profiles amd64 hardened/linux/amd64 stable diff --git a/profiles/releases/freebsd-11.1/package.mask b/profiles/releases/freebsd-11.1/package.mask new file mode 100644 index 00000000000..d2db415aa6b --- /dev/null +++ b/profiles/releases/freebsd-11.1/package.mask @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# Make sure we don't get wrong versions +<sys-freebsd/freebsd-pam-modules-11.1_alpha +>sys-freebsd/freebsd-pam-modules-11.1.99 +<sys-freebsd/freebsd-rescue-11.1_alpha +>sys-freebsd/freebsd-rescue-11.1.99 +<sys-freebsd/freebsd-pf-11.1_alpha +>sys-freebsd/freebsd-pf-11.1.99 +<sys-freebsd/freebsd-mk-defs-11.1_alpha +>sys-freebsd/freebsd-mk-defs-11.1.99 +<sys-freebsd/freebsd-lib-11.1_alpha +>sys-freebsd/freebsd-lib-11.1.99 +<sys-freebsd/freebsd-libexec-11.1_alpha +>sys-freebsd/freebsd-libexec-11.1.99 +<sys-freebsd/freebsd-bin-11.1_alpha +>sys-freebsd/freebsd-bin-11.1.99 +<sys-freebsd/freebsd-sbin-11.1_alpha +>sys-freebsd/freebsd-sbin-11.1.99 +<sys-freebsd/freebsd-ubin-11.1_alpha +>sys-freebsd/freebsd-ubin-11.1.99 +>sys-freebsd/freebsd-usbin-11.1.99 +<sys-freebsd/freebsd-share-11.1_alpha +>sys-freebsd/freebsd-share-11.1.99 +<sys-freebsd/freebsd-contrib-11.1_alpha +>sys-freebsd/freebsd-contrib-11.1.99 +>sys-freebsd/freebsd-cddl-11.1.99 +<sys-freebsd/boot0-11.1_alpha +>sys-freebsd/boot0-11.1.99 +<sys-freebsd/freebsd-sources-11.1_alpha +>sys-freebsd/freebsd-sources-11.1.99 + +# We masked different versions for easy upgrade. bug #491774 +# Please keep <freebsd-cddl-9.2_alpha and <freebsd-usbin-9.1_alpha. +<sys-freebsd/freebsd-cddl-9.2_alpha +<sys-freebsd/freebsd-usbin-9.1_alpha + +# Alexis Ballier <aball...@gentoo.org> (07 Nov 2011) +# It is in freebsd-ubin starting from FreeBSD 9.0 +sys-process/fuser-bsd + +# Alexis Ballier <aball...@gentoo.org> (11 May 2012) +# freebsd-lib provides a utempter compatible interface starting from FreeBSD 9.0 +# via libulog. +# this package does not build anymore as it requires utmp +sys-libs/libutempter diff --git a/profiles/releases/freebsd-11.1/package.use.force b/profiles/releases/freebsd-11.1/package.use.force new file mode 100644 index 00000000000..dcb6a5d2e7c --- /dev/null +++ b/profiles/releases/freebsd-11.1/package.use.force @@ -0,0 +1,5 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# freebsd-sources[build-generic] requires clang +sys-devel/llvm clang diff --git a/profiles/releases/freebsd-11.1/packages b/profiles/releases/freebsd-11.1/packages new file mode 100644 index 00000000000..a68d7505d93 --- /dev/null +++ b/profiles/releases/freebsd-11.1/packages @@ -0,0 +1,12 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +*>=sys-apps/baselayout-2.0.0 +*>=sys-apps/openrc-0.2.5 + +# dev-libs/libiconv and freebsd-contrib aren't necessary in 10.0 and later. +-*dev-libs/libiconv +-*sys-freebsd/freebsd-contrib + +# sys-freebsd/freebsd-libexec was merged into freebsd-lib in 11.1 and later. +-*sys-freebsd/freebsd-libexec diff --git a/profiles/releases/freebsd-11.1/packages.build b/profiles/releases/freebsd-11.1/packages.build new file mode 100644 index 00000000000..a6ca5a9327c --- /dev/null +++ b/profiles/releases/freebsd-11.1/packages.build @@ -0,0 +1,7 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +-dev-libs/libiconv +-sys-freebsd/freebsd-contrib +-sys-freebsd/freebsd-libexec +sys-freebsd/freebsd-share diff --git a/profiles/releases/freebsd-11.1/parent b/profiles/releases/freebsd-11.1/parent new file mode 100644 index 00000000000..f3229c5b987 --- /dev/null +++ b/profiles/releases/freebsd-11.1/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/releases/freebsd-11.1/profile.bashrc b/profiles/releases/freebsd-11.1/profile.bashrc new file mode 100644 index 00000000000..8987e6d324f --- /dev/null +++ b/profiles/releases/freebsd-11.1/profile.bashrc @@ -0,0 +1,33 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +bsd-fbsd10fix(){ + # http://svnweb.freebsd.org/ports/head/Mk/bsd.port.mk + + for f in `find ${WORKDIR} -type f \( -name config.libpath -o \ + -name config.rpath -o -name configure -o -name libtool.m4 -o \ + -name ltconfig -o -name libtool -o -name aclocal.m4 -o \ + -name acinclude.m4 \)` ; do \ + sed -i.fbsd10bak \ + -e 's|freebsd1\*)|freebsd1.\*)|g' \ + -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ + -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ + -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ + -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ + ${f} ; \ + touch -mr ${f}.fbsd10bak ${f} ; \ + rm -f ${f}.fbsd10bak ; \ + einfo "===> FreeBSD 10 autotools fix applied to ${f}"; \ + done +} + +if [[ -n $EAPI ]] ; then + case "$EAPI" in + 0|1) + post_src_unpack() { bsd-patch_install-sh ; bsd-fbsd10fix ; } + ;; + *) + post_src_prepare() { bsd-patch_install-sh ; bsd-fbsd10fix ; } + ;; + esac +fi