Move clang fbsd profile data to arch/amd64-fbsd. Bug #491654 by Yuta SATOH.

17 files changed, 15 insertions, 225 deletions

diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index c5007cb634a5..987291abeec2 100644
--- a/profiles/default/bsd/ChangeLog
+++ b/profiles/default/bsd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for profile directory
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.172 2014/12/24 17:57:56 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.173 2015/02/08 16:29:54 mgorny Exp $
+
+  08 Feb 2015; Michał Górny <mgorny@gentoo.org> -fbsd/amd64/9.1/clang/eapi,
+  -fbsd/amd64/9.1/clang/make.defaults, -fbsd/amd64/9.1/clang/package.use.force,
+  -fbsd/amd64/9.1/clang/package.use.mask, -fbsd/amd64/9.1/clang/packages,
+  -fbsd/amd64/9.1/clang/packages.build, fbsd/amd64/9.1/clang/parent,
+  -fbsd/amd64/9.1/clang/profile.bashrc, -fbsd/amd64/9.2/clang/eapi,
+  -fbsd/amd64/9.2/clang/make.defaults, -fbsd/amd64/9.2/clang/package.use.force,
+  -fbsd/amd64/9.2/clang/package.use.mask, -fbsd/amd64/9.2/clang/packages,
+  -fbsd/amd64/9.2/clang/packages.build, fbsd/amd64/9.2/clang/parent,
+  -fbsd/amd64/9.2/clang/profile.bashrc:
+  Move clang fbsd profile data to arch/amd64-fbsd. Bug #491654 by Yuta SATOH.
 
   24 Dec 2014; Matthias Maier <tamiko@gentoo.org> package.use.mask:
   mask doxysearch use flag for app-doc/doxygen
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/eapi b/profiles/default/bsd/fbsd/amd64/9.1/clang/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults
deleted file mode 100644
index 29293024a58c..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults,v 1.1 2013/06/19 20:13:50 aballier Exp $
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="-stdlib=libc++ ${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force
deleted file mode 100644
index 97067e94808e..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force,v 1.5 2013/07/27 23:27:39 aballier Exp $
-
-# Force building libc++ over libcxxrt.
-sys-libs/libcxx libcxxrt
-
-# Force static libs and multilib on the C++ stack.
-sys-libs/libcxxrt static-libs abi_x86_32
-sys-libs/libcxx static-libs abi_x86_32
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl ssl curl_ssl_openssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
deleted file mode 100644
index 2cdb077b199b..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.5 2014/07/15 10:20:32 blueness Exp $
-
-# Build libcxxrt over libgcc_s since that is what clang defaults to.
-sys-libs/libcxxrt libunwind
-
-# Needs to be fixed: cxx useflag enables plugins and gold. 
-# gold fails to build with clang:
-# https://bugs.gentoo.org/show_bug.cgi?id=427344
-# http://llvm.org/bugs/show_bug.cgi?id=12299
-sys-devel/binutils cxx
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
deleted file mode 100644
index ceaaa6040250..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages,v 1.2 2013/05/25 22:04:45 aballier Exp $
-
-# Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
-# stack.
-
-*sys-devel/llvm
-*sys-devel/clang
-*sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
deleted file mode 100644
index af06e6121663..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build,v 1.4 2013/05/25 22:04:45 aballier Exp $
-
-# This file describes the packages needed to build a stage 1 based on this
-# profile.  Packages in this file are built in order.
-
-# Please do not move perl before baselayout doing so will break lib -> lib64
-# symlinks on systems that use them.
-
-app-arch/bzip2
-app-arch/gzip
-dev-libs/openssl
-app-arch/libarchive
-app-shells/bash
-net-misc/rsync
-net-misc/wget
-sys-devel/autoconf
-sys-devel/automake
-sys-devel/libtool
-sys-apps/openrc
-sys-apps/baselayout
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/portage
-sys-apps/sed
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-dev-libs/libiconv
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/make
-sys-devel/patch
-virtual/editor
-virtual/libc
-virtual/os-headers
-sys-freebsd/freebsd-mk-defs
-sys-freebsd/freebsd-lib
-sys-freebsd/freebsd-libexec
-sys-freebsd/freebsd-bin
-sys-freebsd/freebsd-sbin
-sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
-sys-freebsd/freebsd-contrib
-sys-devel/llvm
-sys-devel/clang
-sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/parent b/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
index f3229c5b9876..7dbda405f0ab 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
+++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
@@ -1 +1,2 @@
 ..
+../../../../../../arch/amd64-fbsd/clang
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc b/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
deleted file mode 100644
index af919bc6fc0c..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc,v 1.2 2013/05/25 22:04:45 aballier Exp $
-
-# Check if clang/clang++ exist before setting them so that we can more easily
-# switch to this profile and build stages.
-type -P clang > /dev/null && export CC=clang
-type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ] && export CXX="clang++ -stdlib=libc++"
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/eapi b/profiles/default/bsd/fbsd/amd64/9.2/clang/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults b/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults
deleted file mode 100644
index 8ab5e081d06c..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="-stdlib=libc++ ${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force
deleted file mode 100644
index e13759f61cc0..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force,v 1.2 2013/08/10 02:33:31 aballier Exp $
-
-# Force building libc++ over libcxxrt.
-sys-libs/libcxx libcxxrt
-
-# Force static libs and multilib on the C++ stack.
-sys-libs/libcxxrt static-libs abi_x86_32
-sys-libs/libcxx static-libs abi_x86_32
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl ssl curl_ssl_openssl
-
-# We obviously need clang
-sys-devel/llvm clang
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
deleted file mode 100644
index f7204c7ac93d..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask,v 1.2 2014/07/15 10:20:32 blueness Exp $
-
-# Build libcxxrt over libgcc_s since that is what clang defaults to.
-sys-libs/libcxxrt libunwind
-
-# Needs to be fixed: cxx useflag enables plugins and gold. 
-# gold fails to build with clang:
-# https://bugs.gentoo.org/show_bug.cgi?id=427344
-# http://llvm.org/bugs/show_bug.cgi?id=12299
-sys-devel/binutils cxx
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages b/profiles/default/bsd/fbsd/amd64/9.2/clang/packages
deleted file mode 100644
index f1297a81c773..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/packages,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
-# stack.
-
-*sys-devel/llvm
-*sys-devel/clang
-*sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build b/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build
deleted file mode 100644
index 6bcd8c57fd47..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# This file describes the packages needed to build a stage 1 based on this
-# profile.  Packages in this file are built in order.
-
-# Please do not move perl before baselayout doing so will break lib -> lib64
-# symlinks on systems that use them.
-
-app-arch/bzip2
-app-arch/gzip
-dev-libs/openssl
-app-arch/libarchive
-app-shells/bash
-net-misc/rsync
-net-misc/wget
-sys-devel/autoconf
-sys-devel/automake
-sys-devel/libtool
-sys-apps/openrc
-sys-apps/baselayout
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/portage
-sys-apps/sed
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-dev-libs/libiconv
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/make
-sys-devel/patch
-virtual/editor
-virtual/libc
-virtual/os-headers
-sys-freebsd/freebsd-mk-defs
-sys-freebsd/freebsd-lib
-sys-freebsd/freebsd-libexec
-sys-freebsd/freebsd-bin
-sys-freebsd/freebsd-sbin
-sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
-sys-freebsd/freebsd-contrib
-sys-devel/llvm
-sys-devel/clang
-sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/parent b/profiles/default/bsd/fbsd/amd64/9.2/clang/parent
index f3229c5b9876..7dbda405f0ab 100644
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/parent
+++ b/profiles/default/bsd/fbsd/amd64/9.2/clang/parent
@@ -1 +1,2 @@
 ..
+../../../../../../arch/amd64-fbsd/clang
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc b/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc
deleted file mode 100644
index c9964e9c6c2e..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# Check if clang/clang++ exist before setting them so that we can more easily
-# switch to this profile and build stages.
-type -P clang > /dev/null && export CC=clang
-type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ] && export CXX="clang++ -stdlib=libc++"