diff options
author | Christoph Junghans <ottxor@gentoo.org> | 2013-10-21 15:41:07 -0600 |
---|---|---|
committer | Christoph Junghans <ottxor@gentoo.org> | 2013-10-21 15:41:07 -0600 |
commit | 7bfc1e27302f2f150e96ae283364ffc8672db422 (patch) | |
tree | c5e144a6eae9704bc7ca87ba4a00758f8c540cbc | |
parent | In dev-cpp/eigen avoid creating TeX fonts out of the sandbox. (diff) | |
download | sci-7bfc1e27302f2f150e96ae283364ffc8672db422.tar.gz sci-7bfc1e27302f2f150e96ae283364ffc8672db422.tar.bz2 sci-7bfc1e27302f2f150e96ae283364ffc8672db422.zip |
merge into gx86
-rw-r--r-- | dev-util/ccache/ChangeLog | 31 | ||||
-rw-r--r-- | dev-util/ccache/Manifest | 1 | ||||
-rw-r--r-- | dev-util/ccache/ccache-3.1.9-r2.ebuild | 64 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-3.1.7-no-perl.patch | 15 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch | 156 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-config-2 | 98 | ||||
-rw-r--r-- | dev-util/ccache/metadata.xml | 15 |
7 files changed, 0 insertions, 380 deletions
diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog deleted file mode 100644 index d2957810e..000000000 --- a/dev-util/ccache/ChangeLog +++ /dev/null @@ -1,31 +0,0 @@ -# ChangeLog for dev-util/ccache -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*ccache-3.1.9-r2 (22 Aug 2013) - - 22 Aug 2013; Andrew Savchenko <bircoph@gmail.com> files/ccache-config-2, - -ccache-3.1.9-r1.ebuild, +ccache-3.1.9-r2.ebuild: - Remove mpi support: mpi compilers are just wrappers around system - compilers --- if the latter are supported by ccache mpi compilation - will be supported too. - - 07 Jul 2013; Christoph Junghans <ottxor@gentoo.org> - +files/ccache-3.1.9-test-gcc-4.8.patch, ccache-3.1.9-r1.ebuild, - files/ccache-config-2: - added mpi use, sync with gx86 - -*ccache-3.1.9-r1 (18 Feb 2013) - - 18 Feb 2013; Christoph Junghans <ottxor@gentoo.org> +ccache-3.1.9-r1.ebuild, - -ccache-3.1.8-r1.ebuild: - version bump - - 27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> files/ccache-config-2: - dev-util/ccache: fixed clang links - -*ccache-3.1.8-r1 (27 Dec 2012) - - 27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> +ccache-3.1.8-r1.ebuild, - +files/ccache-3.1.7-no-perl.patch, +files/ccache-config-2, +metadata.xml: - added for testing diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest deleted file mode 100644 index 690161a13..000000000 --- a/dev-util/ccache/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ccache-3.1.9.tar.xz 238988 SHA256 4981fdf3ad851de400d94083a0d03f115ce9ce8062c3fd7a291630294b0006c4 SHA512 b73f5816bb87c2d94200473510ea42a304c5a2c5e5f14720c513574ce3eb983423c5849a786a89df70cbb09852d9ec2761ad37a820a767d7350e1a3243148ac0 WHIRLPOOL 61ef671aae68516ecfaee88a50b8f442968a7ab24595fd7dfc652ab27de80834d90510c62cfcc75dd88e1f3832989633f518ebe5984149c16d5ab9848cff05fc diff --git a/dev-util/ccache/ccache-3.1.9-r2.ebuild b/dev-util/ccache/ccache-3.1.9-r2.ebuild deleted file mode 100644 index 5bf0d9ee7..000000000 --- a/dev-util/ccache/ccache-3.1.9-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.8.ebuild,v 1.9 2012/12/17 17:51:11 ago Exp $ - -EAPI=5 - -inherit multilib eutils readme.gentoo - -DESCRIPTION="fast compiler cache" -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="clang icc" - -RDEPEND="sys-libs/zlib - clang? ( sys-devel/clang ) - icc? ( dev-lang/icc )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -src_prepare() { - # make sure we always use system zlib - rm -rf zlib - epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609 - epatch "${FILESDIR}"/${P}-test-gcc-4.8.patch #461966 - sed \ - -e "/^LIBDIR=/s:lib:$(get_libdir):" \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-2 > ccache-config || die - - DOC_CONTENTS="To use ccache with **non-Portage** C compiling, add - ${EROOT}usr/$(get_libdir)/ccache/bin to the beginning of your path, before ${EROOT}usr/bin. - Portage 2.0.46-r11+ will automatically take advantage of ccache with - no additional steps. If this is your first install of ccache, type - something like this to set a maximum cache size of 2GB:\\n# ccache -M 2G\\n - If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n - # CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C" -} - -src_install() { - default - dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt - - dobin ccache-config - - readme.gentoo_create_doc -} - -pkg_postinst() { - "${EROOT}"/usr/bin/ccache-config --install-links - "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST} - use icc && "${EROOT}"/usr/bin/ccache-config --install-links icc - use clang && "${EROOT}"/usr/bin/ccache-config --install-links clang - - # nuke broken symlinks from previous versions that shouldn't exist - rm -f "${EROOT}/usr/$(get_libdir)/ccache/bin/${CHOST}-cc" - [[ -d "${EROOT}/usr/$(get_libdir)/ccache.backup" ]] && \ - rm -rf "${EROOT}/usr/$(get_libdir)/ccache.backup" - - readme.gentoo_pkg_postinst -} diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch deleted file mode 100644 index 5abd15e1a..000000000 --- a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch +++ /dev/null @@ -1,15 +0,0 @@ -avoid weak perl usage in tests - -https://bugs.gentoo.org/421609 - ---- a/test.sh -+++ b/test.sh -@@ -1466,7 +1466,7 @@ - mkdir -p $dir - i=0 - while [ $i -lt 10 ]; do -- perl -e 'print "A" x 4017' >$dir/result$i-4017.o -+ printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o - touch $dir/result$i-4017.stderr - touch $dir/result$i-4017.d - if [ $i -gt 5 ]; then diff --git a/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch b/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch deleted file mode 100644 index 2a28baf02..000000000 --- a/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch +++ /dev/null @@ -1,156 +0,0 @@ -https://bugs.gentoo.org/461966 - -fix from upstream - -From b5d63f81c1a83fd4c50b769a96a04f581b7db70c Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl <joel@rosdahl.net> -Date: Wed, 20 Mar 2013 22:18:16 +0100 -Subject: [PATCH] Fix test suite failure on GCC 4.8 - -GCC 4.8 includes /usr/include/stdc-predef.h implicitly, and this shows up -in generated .d files. ---- - test.sh | 35 +++++++++++++++++++---------------- - 1 file changed, 19 insertions(+), 16 deletions(-) - -diff --git a/test.sh b/test.sh -index 3ed9069..3e38387 100755 ---- a/test.sh -+++ b/test.sh -@@ -3,7 +3,7 @@ - # A simple test suite for ccache. - # - # Copyright (C) 2002-2007 Andrew Tridgell --# Copyright (C) 2009-2012 Joel Rosdahl -+# Copyright (C) 2009-2013 Joel Rosdahl - # - # This program is free software; you can redistribute it and/or modify it under - # the terms of the GNU General Public License as published by the Free Software -@@ -562,6 +562,9 @@ int test3; - EOF - backdate test1.h test2.h test3.h - -+ $COMPILER -c -Wp,-MD,expected.d test.c -+ expected_d_content=`cat expected.d` -+ - ################################################################## - # First compilation is a miss. - testname="first compilation" -@@ -677,7 +680,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -685,7 +688,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -760,7 +763,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -768,7 +771,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - ################################################################## - # Check the scenario of running a ccache with direct mode on a cache -@@ -780,7 +783,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -788,7 +791,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 1 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -796,7 +799,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 2 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -804,7 +807,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 2 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - ################################################################## - # Check that -MF works. -@@ -815,7 +818,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -823,7 +826,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - ################################################################## - # Check that a missing .d file in the cache is handled correctly. -@@ -835,13 +838,13 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - $CCACHE $COMPILER -c -MD test.c - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \; - -@@ -849,7 +852,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 1 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - ################################################################## - # Check that stderr from both the preprocessor and the compiler is emitted --- -1.8.1.2 - diff --git a/dev-util/ccache/files/ccache-config-2 b/dev-util/ccache/files/ccache-config-2 deleted file mode 100644 index d0345d3be..000000000 --- a/dev-util/ccache/files/ccache-config-2 +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# -# ccache-config - helper script for ccache and its ebuild -# -# Copyright 1999-2013 Superlucidity Services, LLC -# Copyright 2013-2013 Gentoo Foundation -# This program licensed under the GNU GPL version 2. -# -# This script developed by Zachary T Welch at Superlucidity Services, LLC -# it was cloned from the distcc-config script -# -# Additional features to come; this provides a starting point - -EPREFIX='' - -. "${EPREFIX}"/etc/init.d/functions.sh 2>/dev/null || { - ebegin() { echo " * $* ..."; } - eend() { - local r=${1:-$?} - [ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]" - return $r - } -} - -LIBDIR="lib" - -# this should be getopt'd someday (override with CC_QUIET=1) -CC_VERBOSE=1 -unset _CC_QUIET -c_quiet() { - [ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ] -} - -c_ebegin() { c_quiet || ebegin "$@" ; } -c_eend() { c_quiet || eend "$@" ; } - -### -# the following functions manage the ccache symlinks -# they allow the user or other scripts (namely gcc-config) to -# automatically update ccache's links when upgrading toolchains -# -cc_path() { - echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1 -} -cc_remove_link() { - local t=$(cc_path "$1") - if [ -L ${t} ]; then - c_ebegin "Removing ${t}" - rm -f "${t}" - c_eend - fi -} -cc_install_link() { - # Search the PATH for the specified compiler - # then create shadow link in /usr/lib/ccache/bin to ccache - - if [ -n "$(type -p ${1})" ]; then - # first be sure any old link is removed - _CC_QUIET=1 - cc_remove_link "${1}" - unset _CC_QUIET - - # then create the new link - local t=$(cc_path "$1") - c_ebegin "Creating ccache shadow link ${t}" - mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}" - c_eend - fi -} -cc_links() { - local a compilers="gcc cc c++ g++" - [ "${2}" = icc ] && compilers="icc icpc" && set -- "$1" - [ "${2}" = clang ] && compilers="clang clang++" && set -- "$1" - for a in ${compilers} ; do - if [ -n "${2}" ] ; then - # gcc-config doesnt install ${CHOST}-cc, so until - # it does, don't install a ccache symlink for it - [ "${a}" = "cc" ] && continue - a="${2}-${a}" - fi - eval "cc_${1}_link" "${a}" - done -} - -### -# main routine - -case "${1}" in - --install-links ) - cc_links install "${2}" - ;; - --remove-links ) - cc_links remove "${2}" - ;; - * ) - echo "usage: ${0} {--install-links|--remove-links} [ CHOST|clang|icc ]" - ;; -esac diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml deleted file mode 100644 index f4a27c768..000000000 --- a/dev-util/ccache/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>ottxor@gentoo.org</email> - </maintainer> - <longdescription lang="en"> - ccache acts as a caching pre-processor to C/C++ compilers, improving - compilation time when recompiling previously compiled source. - </longdescription> - <use> - <flag name='clang'>create links for <pkg>sys-devel/clang</pkg></flag> - <flag name='icc'>create links for <pkg>dev-lang/icc</pkg></flag> - </use> -</pkgmetadata> |