commit: eb15ec4fac5a7ce8f567e9b0ba68ac9a7704d203 Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> AuthorDate: Sat Jul 4 13:33:17 2015 +0000 Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> CommitDate: Sat Jul 4 13:33:17 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=eb15ec4f
Clean up profiles. profiles/arch/amd64-fbsd/clang/ChangeLog | 43 ------------ profiles/arch/amd64-fbsd/clang/make.defaults | 8 --- profiles/arch/amd64-fbsd/clang/package.use.force | 17 ----- profiles/arch/amd64-fbsd/clang/package.use.mask | 16 ----- profiles/arch/amd64-fbsd/clang/packages | 10 --- profiles/arch/amd64-fbsd/clang/packages.build | 7 -- profiles/arch/amd64-fbsd/clang/parent | 1 - profiles/arch/amd64-fbsd/clang/profile.bashrc | 12 ---- profiles/default/bsd/fbsd/amd64/10.1/clang/parent | 2 - profiles/default/bsd/fbsd/amd64/10.1/make.defaults | 11 --- .../default/bsd/fbsd/amd64/10.1/package.use.force | 4 -- profiles/default/bsd/fbsd/amd64/10.1/parent | 2 - profiles/default/bsd/fbsd/x86/10.1/make.defaults | 9 --- profiles/default/bsd/fbsd/x86/10.1/parent | 2 - profiles/default/bsd/profile.bashrc | 82 ---------------------- profiles/releases/freebsd-10.1/package.mask | 53 -------------- profiles/releases/freebsd-10.1/package.use.force | 6 -- profiles/releases/freebsd-10.1/packages | 10 --- profiles/releases/freebsd-10.1/packages.build | 7 -- profiles/releases/freebsd-10.1/parent | 1 - profiles/releases/freebsd-10.1/profile.bashrc | 35 --------- 21 files changed, 338 deletions(-) diff --git a/profiles/arch/amd64-fbsd/clang/ChangeLog b/profiles/arch/amd64-fbsd/clang/ChangeLog deleted file mode 100644 index b6446cd..0000000 --- a/profiles/arch/amd64-fbsd/clang/ChangeLog +++ /dev/null @@ -1,43 +0,0 @@ -# ChangeLog for profile directory -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/ChangeLog,v 1.2 2013/08/10 02:33:31 aballier Exp $ - - 10 Aug 2013; Alexis Ballier <[email protected]> package.use.force: - force clang useflag on llvm - - 27 Jul 2013; Alexis Ballier <[email protected]> package.use.force: - build libcxx multilib, patch by Yuta SATOH in bug #475294 - - 19 Jun 2013; Alexis Ballier <[email protected]> +make.defaults: - add default cflags, esp. CXXFLAGS=-stdlib=libc++ ... - - 19 Jun 2013; Alexis Ballier <[email protected]> package.use.force, - package.use.mask: - force curl[ssl,curl_ssl_openssl] and mask the others: curl is in @system for - this profile so better have it with sane defaults. - - 19 Jun 2013; Alexis Ballier <[email protected]> -package.unmask: - no need to unmask clang 3.3 now that it is unmasked globally - - 17 Jun 2013; Alexis Ballier <[email protected]> +package.unmask: - Unmask llvm/clang 3.3_rc since llvm 3.2 does not build with clang++ - -stdlib=libc++ - - 01 Jun 2013; Alexis Ballier <[email protected]> package.use.force, - package.use.mask: - Build libcxxrt over libgcc_s since that is what clang defaults to. - - 31 May 2013; Alexis Ballier <[email protected]> package.use.mask: - libunwind is rather core for our C++ stack. Better not have it link to - liblzma for smaller debug info. - - 31 May 2013; Alexis Ballier <[email protected]> package.use.force: - Force building libc++ over libcxxrt - - 31 May 2013; Alexis Ballier <[email protected]> +package.use.force: - Force static libs on the C++ stack so that static linking has a chance to - work - - 30 May 2013; Alexis Ballier <[email protected]> +package.use.mask: - Mask binutils[cxx], bug #427344 (and add a ChangeLog here) - diff --git a/profiles/arch/amd64-fbsd/clang/make.defaults b/profiles/arch/amd64-fbsd/clang/make.defaults deleted file mode 100644 index 693bf18..0000000 --- a/profiles/arch/amd64-fbsd/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: $ - -CFLAGS="-O2 -pipe" -CXXFLAGS="-stdlib=libc++ ${CFLAGS}" -FFLAGS="${CFLAGS}" -FCFLAGS="${CFLAGS}" diff --git a/profiles/arch/amd64-fbsd/clang/package.use.force b/profiles/arch/amd64-fbsd/clang/package.use.force deleted file mode 100644 index 3d54a7b..0000000 --- a/profiles/arch/amd64-fbsd/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: $ - -# 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 static-analyzer diff --git a/profiles/arch/amd64-fbsd/clang/package.use.mask b/profiles/arch/amd64-fbsd/clang/package.use.mask deleted file mode 100644 index 9c2ad32..0000000 --- a/profiles/arch/amd64-fbsd/clang/package.use.mask +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# 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_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl diff --git a/profiles/arch/amd64-fbsd/clang/packages b/profiles/arch/amd64-fbsd/clang/packages deleted file mode 100644 index ded54d2..0000000 --- a/profiles/arch/amd64-fbsd/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: $ - -# 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/arch/amd64-fbsd/clang/packages.build b/profiles/arch/amd64-fbsd/clang/packages.build deleted file mode 100644 index dbba9b1..0000000 --- a/profiles/arch/amd64-fbsd/clang/packages.build +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -sys-devel/llvm -sys-devel/clang -sys-libs/libcxx diff --git a/profiles/arch/amd64-fbsd/clang/parent b/profiles/arch/amd64-fbsd/clang/parent deleted file mode 100644 index f3229c5..0000000 --- a/profiles/arch/amd64-fbsd/clang/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/arch/amd64-fbsd/clang/profile.bashrc b/profiles/arch/amd64-fbsd/clang/profile.bashrc deleted file mode 100644 index d768f5f..0000000 --- a/profiles/arch/amd64-fbsd/clang/profile.bashrc +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -# 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 -if type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ]; then - export CXX="clang++ -stdlib=libc++" - # add -stdlib=libc++ to CXXFLAGS, bug 498910. - [[ ${CXXFLAGS} != *-stdlib=libc++* ]] && export CXXFLAGS="-stdlib=libc++ ${CXXFLAGS}" -fi diff --git a/profiles/default/bsd/fbsd/amd64/10.1/clang/parent b/profiles/default/bsd/fbsd/amd64/10.1/clang/parent deleted file mode 100644 index 7dbda40..0000000 --- a/profiles/default/bsd/fbsd/amd64/10.1/clang/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../arch/amd64-fbsd/clang diff --git a/profiles/default/bsd/fbsd/amd64/10.1/make.defaults b/profiles/default/bsd/fbsd/amd64/10.1/make.defaults deleted file mode 100644 index 65c8683..0000000 --- a/profiles/default/bsd/fbsd/amd64/10.1/make.defaults +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -CHOST="x86_64-gentoo-freebsd10.1" -CHOST_amd64_fbsd="x86_64-gentoo-freebsd10.1" -CHOST_x86_fbsd="i686-gentoo-freebsd10.1" - -# Diego Pettenò <[email protected]> (2 Dec 2006) -# Turn this on by default as we don't have Java 1.4 and 1.5 at all -USE="java6" diff --git a/profiles/default/bsd/fbsd/amd64/10.1/package.use.force b/profiles/default/bsd/fbsd/amd64/10.1/package.use.force deleted file mode 100644 index 4229a8f..0000000 --- a/profiles/default/bsd/fbsd/amd64/10.1/package.use.force +++ /dev/null @@ -1,4 +0,0 @@ -# >=dev-lang/python-3.2 requires threads, #494744 -=dev-lang/python-3.2* threads -=dev-lang/python-3.3* threads - diff --git a/profiles/default/bsd/fbsd/amd64/10.1/parent b/profiles/default/bsd/fbsd/amd64/10.1/parent deleted file mode 100644 index ab6b4ed..0000000 --- a/profiles/default/bsd/fbsd/amd64/10.1/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../releases/freebsd-10.1 diff --git a/profiles/default/bsd/fbsd/x86/10.1/make.defaults b/profiles/default/bsd/fbsd/x86/10.1/make.defaults deleted file mode 100644 index f16d073..0000000 --- a/profiles/default/bsd/fbsd/x86/10.1/make.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -CHOST="i486-gentoo-freebsd10.1" - -# Diego Pettenò <[email protected]> (2 Dec 2006) -# Turn this on by default as we don't have Java 1.4 and 1.5 at all -USE="java6" diff --git a/profiles/default/bsd/fbsd/x86/10.1/parent b/profiles/default/bsd/fbsd/x86/10.1/parent deleted file mode 100644 index ab6b4ed..0000000 --- a/profiles/default/bsd/fbsd/x86/10.1/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../releases/freebsd-10.1 diff --git a/profiles/default/bsd/profile.bashrc b/profiles/default/bsd/profile.bashrc deleted file mode 100644 index 70932e3..0000000 --- a/profiles/default/bsd/profile.bashrc +++ /dev/null @@ -1,82 +0,0 @@ -if [[ ${EBUILD_PHASE} == compile ]] ; then - if grep -q "Assume that mode_t is passed compatibly" ${S} -r --include openat.c; then - eerror "The source code contains a faulty openat.c unit from gnulib." - eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD." - eerror "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%2FAlt&component=FreeBSD&op_sys=FreeBSD"; - die "Broken openat.c gnulib unit." - fi - if grep -q "test .*==" "${S}" -r --include configure; then - eerror "Found a non POSIX test construction in a configure script" - eerror "The configure checks of this package may not function properly" - eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD." - eerror "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%2FAlt&component=FreeBSD&op_sys=FreeBSD"; - fi -fi - -# Hack to avoid every package that uses libiconv/gettext -# install a charset.alias that will collide with libiconv's one -# See bugs 169678, 195148 and 256129. -# Also the discussion on -# http://archives.gentoo.org/gentoo-dev/msg_8cb1805411f37b4eb168a3e680e531f3.xml -bsd-post_src_install() { - local f - if [[ ${PN} != "libiconv" && -n $(ls "${D}"/usr/lib*/charset.alias 2>/dev/null) ]]; then - einfo "automatically removing charset.alias" - rm -f "${D}"/usr/lib*/charset.alias - fi -} - -# These are because of -# http://archives.gentoo.org/gentoo-dev/msg_529a0806ed2cf841a467940a57e2d588.xml -# The profile-* ones are meant to be used in etc/portage/profile.bashrc by user -# until there is the registration mechanism. -profile-post_src_install() { bsd-post_src_install ; } - post_src_install() { bsd-post_src_install ; } - -# Another hack to fix old versions of install-sh (automake) where a non-gnu -# mkdir is not considered thread-safe (make install errors with -j > 1) - -bsd-post_src_unpack() { - # Do nothing if we don't have patch installed: - if [[ -z $(type -P gpatch) ]]; then - return 0 - fi - local EPDIR="${ECLASSDIR}/ELT-patches/install-sh" - local EPATCHES="${EPDIR}/1.5.6 ${EPDIR}/1.5.4 ${EPDIR}/1.5" - local ret=0 - for file in $(find . -name "install-sh" -print); do - if [[ -n $(egrep "scriptversion=2005|scriptversion=2004" ${file}) ]]; then - einfo "Automatically patching parallel-make unfriendly install-sh." - # Stolen from libtool.eclass - for mypatch in ${EPATCHES}; do - if gpatch -p0 --dry-run "${file}" "${mypatch}" &> "${T}/patch_install-sh.log"; then - gpatch -p0 -g0 --no-backup-if-mismatch "${file}" "${mypatch}" \ - &> "${T}/patch_install-sh.log" - ret=$? - break - else - ret=1 - fi - done - if [[ ret -eq 0 ]]; then - einfo "Patch applied successfully on \"${file}\"." - else - ewarn "Unable to apply install-sh patch. " - ewarn "If you experience errors during install phase, try with MAKEOPTS=\"-j1\"" - fi - fi - done -} - -if [[ -n $EAPI ]] ; then - case "$EAPI" in - 0|1) - profile-post_src_unpack() { bsd-post_src_unpack ; } - post_src_unpack() { bsd-post_src_unpack ; } - ;; - *) - profile_post_src_prepare() { bsd-post_src_unpack ; } - post_src_prepare() { bsd-post_src_unpack ; } - ;; - esac -fi diff --git a/profiles/releases/freebsd-10.1/package.mask b/profiles/releases/freebsd-10.1/package.mask deleted file mode 100644 index bf80e62..0000000 --- a/profiles/releases/freebsd-10.1/package.mask +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -# Make sure we don't get wrong versions -<sys-freebsd/freebsd-pam-modules-10.1_alpha ->sys-freebsd/freebsd-pam-modules-10.1.99 -<sys-freebsd/freebsd-rescue-10.1_alpha ->sys-freebsd/freebsd-rescue-10.1.99 -<sys-freebsd/freebsd-pf-10.1_alpha ->sys-freebsd/freebsd-pf-10.1.99 -<sys-freebsd/freebsd-mk-defs-10.1_alpha ->sys-freebsd/freebsd-mk-defs-10.1.99 -<sys-freebsd/freebsd-lib-10.1_alpha ->sys-freebsd/freebsd-lib-10.1.99 -<sys-freebsd/freebsd-libexec-10.1_alpha ->sys-freebsd/freebsd-libexec-10.1.99 -<sys-freebsd/freebsd-bin-10.1_alpha ->sys-freebsd/freebsd-bin-10.1.99 -<sys-freebsd/freebsd-sbin-10.1_alpha ->sys-freebsd/freebsd-sbin-10.1.99 -<sys-freebsd/freebsd-ubin-10.1_alpha ->sys-freebsd/freebsd-ubin-10.1.99 ->sys-freebsd/freebsd-usbin-10.1.99 -<sys-freebsd/freebsd-share-10.1_alpha ->sys-freebsd/freebsd-share-10.1.99 -<sys-freebsd/freebsd-contrib-10.1_alpha ->sys-freebsd/freebsd-contrib-10.1.99 ->sys-freebsd/freebsd-cddl-10.1.99 -<sys-freebsd/boot0-10.1_alpha ->sys-freebsd/boot0-10.1.99 -<sys-freebsd/freebsd-sources-10.1_alpha ->sys-freebsd/freebsd-sources-10.1.99 - -# Mask version of -cddl and -usbin is different for ease of 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 <[email protected]> (19 Jul 2008) -# JDK/JRE 1.5 are specific to fbsd 6 and 5 -=virtual/jdk-1.5* -=virtual/jre-1.5* - -# Alexis Ballier <[email protected]> (07 Nov 2011) -# It is in freebsd-ubin starting from FreeBSD 9.0 -sys-process/fuser-bsd - -# Alexis Ballier <[email protected]> (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-10.1/package.use.force b/profiles/releases/freebsd-10.1/package.use.force deleted file mode 100644 index fd34990..0000000 --- a/profiles/releases/freebsd-10.1/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -# freebsd-sources[build-generic] requires clang -sys-devel/llvm clang diff --git a/profiles/releases/freebsd-10.1/packages b/profiles/releases/freebsd-10.1/packages deleted file mode 100644 index db48699..0000000 --- a/profiles/releases/freebsd-10.1/packages +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -*>=sys-apps/baselayout-2.0.0 -*>=sys-apps/openrc-0.2.5 - -# Not necessary dev-libs/libiconv and freebsd-contrib in 10.0 and later. --*dev-libs/libiconv --*sys-freebsd/freebsd-contrib diff --git a/profiles/releases/freebsd-10.1/packages.build b/profiles/releases/freebsd-10.1/packages.build deleted file mode 100644 index a9f4d07..0000000 --- a/profiles/releases/freebsd-10.1/packages.build +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - --dev-libs/libiconv --sys-freebsd/freebsd-contrib -sys-freebsd/freebsd-share diff --git a/profiles/releases/freebsd-10.1/parent b/profiles/releases/freebsd-10.1/parent deleted file mode 100644 index f3229c5..0000000 --- a/profiles/releases/freebsd-10.1/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/releases/freebsd-10.1/profile.bashrc b/profiles/releases/freebsd-10.1/profile.bashrc deleted file mode 100644 index a12a9a2..0000000 --- a/profiles/releases/freebsd-10.1/profile.bashrc +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: $ - -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 -
