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

diff --git a/profiles/arch/amd64-fbsd/ChangeLog b/profiles/arch/amd64-fbsd/ChangeLog
index 9d44ed667497c56f9fd6912c05f9f1ea28b057ae..7e1cd9bb6f939d2a6d1fcb6a14b8944f2442f2b3 100644 (file)
--- a/profiles/arch/amd64-fbsd/ChangeLog
+++ b/profiles/arch/amd64-fbsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo/x86-fbsd profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.63 2015/02/01 13:40:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.64 2015/02/08 16:29:53 mgorny Exp $
+
+  08 Feb 2015; Michał Górny <mgorny@gentoo.org> +clang/eapi,
+  +clang/make.defaults, +clang/package.use.force, +clang/package.use.mask,
+  +clang/packages, +clang/packages.build, +clang/parent, +clang/profile.bashrc:
+  Move clang fbsd profile data to arch/amd64-fbsd. Bug #491654 by Yuta SATOH.
 
   01 Feb 2015; Michał Górny <mgorny@gentoo.org> make.defaults:
   Unhide CPU_FLAGS_X86 on {amd64,x86}-fbsd profiles, bug #538322 by Yuta SATOH.

diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/eapi b/profiles/arch/amd64-fbsd/clang/eapi
similarity index 100%
rename from profiles/default/bsd/fbsd/amd64/9.1/clang/eapi
rename to profiles/arch/amd64-fbsd/clang/eapi

diff --git a/profiles/arch/amd64-fbsd/clang/make.defaults b/profiles/arch/amd64-fbsd/clang/make.defaults
new file mode 100644 (file)
index 0000000..f0dc3c3
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/clang/make.defaults,v 1.1 2015/02/08 16:29:53 mgorny 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/arch/amd64-fbsd/clang/package.use.force
similarity index 73%
rename from profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force
rename to profiles/arch/amd64-fbsd/clang/package.use.force
index e13759f61cc007ab7a0351c4da09cfd1213ec51c..292dc8d0a1da07f714a58a782677ed6e51b43dd9 100644 (file)
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force
+++ b/profiles/arch/amd64-fbsd/clang/package.use.force
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/clang/package.use.force,v 1.1 2015/02/08 16:29:53 mgorny Exp $
 
 # Force building libc++ over libcxxrt.
 sys-libs/libcxx libcxxrt

diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask b/profiles/arch/amd64-fbsd/clang/package.use.mask
similarity index 76%
rename from profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
rename to profiles/arch/amd64-fbsd/clang/package.use.mask
index f7204c7ac93d2f1e16c55d59f9b627b10b3b06c1..e4c59deee39a9fbbaf5b0e29877f4af275d0073b 100644 (file)
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
+++ b/profiles/arch/amd64-fbsd/clang/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/clang/package.use.mask,v 1.1 2015/02/08 16:29:53 mgorny Exp $
 
 # Build libcxxrt over libgcc_s since that is what clang defaults to.
 sys-libs/libcxxrt libunwind

diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages b/profiles/arch/amd64-fbsd/clang/packages
similarity index 55%
rename from profiles/default/bsd/fbsd/amd64/9.1/clang/packages
rename to profiles/arch/amd64-fbsd/clang/packages
index ceaaa60402508ff264a0e2aac36b15d99f97ad19..3028173471a0e9920a9cd1dfcf2d06d73a7d60e4 100644 (file)
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
+++ b/profiles/arch/amd64-fbsd/clang/packages
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/clang/packages,v 1.1 2015/02/08 16:29:53 mgorny Exp $
 
 # Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
 # stack.

diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build b/profiles/arch/amd64-fbsd/clang/packages.build
similarity index 86%
rename from profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
rename to profiles/arch/amd64-fbsd/clang/packages.build
index af06e6121663b0fffa95a9833e75ddec9a337676..a7192022f6805b4eb9d08fac7fc316be4d86ffc1 100644 (file)
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
+++ b/profiles/arch/amd64-fbsd/clang/packages.build
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/clang/packages.build,v 1.1 2015/02/08 16:29:53 mgorny Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
 # profile.  Packages in this file are built in order.

diff --git a/profiles/arch/amd64-fbsd/clang/parent b/profiles/arch/amd64-fbsd/clang/parent
new file mode 100644 (file)
index 0000000..f3229c5
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/parent
@@ -0,0 +1 @@
+..

diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc b/profiles/arch/amd64-fbsd/clang/profile.bashrc
similarity index 58%
rename from profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc
rename to profiles/arch/amd64-fbsd/clang/profile.bashrc
index c9964e9c6c2e8bf579df0d48f176e0da513b1e48..fd81028510c6415ffb2ac45f915384b8565cc3e1 100644 (file)
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc
+++ b/profiles/arch/amd64-fbsd/clang/profile.bashrc
@@ -1,6 +1,6 @@
 #!/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 $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/clang/profile.bashrc,v 1.1 2015/02/08 16:29:53 mgorny Exp $
 
 # Check if clang/clang++ exist before setting them so that we can more easily
 # switch to this profile and build stages.

diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index c5007cb634a5cd06d6b40a8820a6dcd07a4247d8..987291abeec25af6cb8f26e2c43d67c3cff051f1 100644 (file)
--- 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/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults
deleted file mode 100644 (file)
index 2929302..0000000
--- 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 (file)
index 97067e9..0000000
--- 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 (file)
index 2cdb077..0000000
--- 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/parent b/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
index f3229c5b98768fac9af7b7ba56da9c071958d0f3..7dbda405f0abac7cb100528426eddef4b460f8db 100644 (file)
--- 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 (file)
index af919bc..0000000
--- 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 (file)
index 7ed6ff8..0000000
--- 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 (file)
index 8ab5e08..0000000
--- 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/packages b/profiles/default/bsd/fbsd/amd64/9.2/clang/packages
deleted file mode 100644 (file)
index f1297a8..0000000
--- 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 (file)
index 6bcd8c5..0000000
--- 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 f3229c5b98768fac9af7b7ba56da9c071958d0f3..7dbda405f0abac7cb100528426eddef4b460f8db 100644 (file)
--- 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