commit: 1363212c042f34bf79eda21e9eb590874043dad8
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 17:35:16 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 17:36:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1363212c
dev-util/gn: remove old
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/gn/Manifest | 2 -
dev-util/gn/files/gn-gen-r0.patch | 51 --------
dev-util/gn/files/gn-gen-r2.patch | 70 -----------
dev-util/gn/files/gn-numerics-arm.patch | 201 --------------------------------
dev-util/gn/gn-0.1445.ebuild | 56 ---------
dev-util/gn/gn-0.1479.ebuild | 64 ----------
6 files changed, 444 deletions(-)
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index f3ba0f953f9..29285e62fd9 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,4 +1,2 @@
-DIST gn-0.1445.tar.gz 958901 BLAKE2B
f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300
SHA512
2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
DIST gn-0.1463.tar.gz 905571 BLAKE2B
e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901
SHA512
f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
-DIST gn-0.1479.tar.gz 909494 BLAKE2B
5d7165371337be630b2d8dcfd8cd067358d56d8d82501288a56bc15955674f0528fde27056c13f32a2b908576a9e2f28529dec9cd1f259e964405874ce74e90f
SHA512
2be22c95952f9993d3f89e932abc0ed08eb2e99a3659322d90bf953b1f68591303b3490e0e55bf3988b1226fefef0a5b7f5d3039eb9ef76e4fe36a2e538ef94a
DIST gn-0.1544.tar.gz 911124 BLAKE2B
b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8
SHA512
5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
diff --git a/dev-util/gn/files/gn-gen-r0.patch
b/dev-util/gn/files/gn-gen-r0.patch
deleted file mode 100644
index d30af3ab4ac..00000000000
--- a/dev-util/gn/files/gn-gen-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/build/gen.py b/build/gen.py
-index fce8fb18..2927da5f 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -260,17 +260,12 @@ def WriteGNNinja(path, options, linux_sysroot):
- if options.debug:
- cflags.extend(['-O0', '-g'])
- else:
-- cflags.append('-DNDEBUG')
-- cflags.append('-O3')
-- ldflags.append('-O3')
- # Use -fdata-sections and -ffunction-sections to place each function
- # or data item into its own section so --gc-sections can eliminate any
- # unused functions and data items.
- cflags.extend(['-fdata-sections', '-ffunction-sections'])
- ldflags.extend(['-fdata-sections', '-ffunction-sections'])
- ldflags.append('-Wl,-dead_strip' if is_mac else '-Wl,--gc-sections')
-- # Omit all symbol information from the output file.
-- ldflags.append('-Wl,-S' if is_mac else '-Wl,-strip-all')
- # Enable identical code-folding.
- if options.use_icf:
- ldflags.append('-Wl,--icf=all')
-@@ -279,11 +274,11 @@ def WriteGNNinja(path, options, linux_sysroot):
- '-D_FILE_OFFSET_BITS=64',
- '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
- '-pthread',
-- '-pipe',
- '-fno-exceptions',
- '-fno-rtti',
- ])
- cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+ ldflags.append('-pthread')
-
- if is_linux:
- if linux_sysroot:
-@@ -293,15 +288,6 @@ def WriteGNNinja(path, options, linux_sysroot):
- # probably resolve this and (re-)add a way to build against libc++.
- cflags.append('--sysroot=' + linux_sysroot)
- ldflags.append('--sysroot=' + linux_sysroot)
-- cflags.append('-stdlib=libstdc++')
-- ldflags.extend(['-static-libstdc++',
-- '-stdlib=libstdc++',
-- '-Wl,--as-needed',
-- ])
-- libs.extend([
-- '-lgcc_s',
-- '-lpthread',
-- ])
- elif is_mac:
- min_mac_version_flag = '-mmacosx-version-min=10.9'
- cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/files/gn-gen-r2.patch
b/dev-util/gn/files/gn-gen-r2.patch
deleted file mode 100644
index 701a317bf02..00000000000
--- a/dev-util/gn/files/gn-gen-r2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 00e907811ea7fc56de73ad44903946a9179b1c4f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <[email protected]>
-Date: Sun, 14 Oct 2018 20:34:07 -0400
-Subject: [PATCH] Remove unwanted cflags/ldflags parameters
-
----
- build/gen.py | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/build/gen.py b/build/gen.py
-index 11c92460..b186e3b0 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options,
linux_sysroot):
- if options.debug:
- cflags.extend(['-O0', '-g'])
- else:
-- cflags.append('-DNDEBUG')
-- cflags.append('-O3')
-- ldflags.append('-O3')
- # Use -fdata-sections and -ffunction-sections to place each function
- # or data item into its own section so --gc-sections can eliminate any
- # unused functions and data items.
-@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options,
linux_sysroot):
- # Garbage collection is done by default on aix.
- ldflags.append('-Wl,--gc-sections')
-
-- # Omit all symbol information from the output file.
-- if platform.is_darwin():
-- ldflags.append('-Wl,-S')
-- elif platform.is_aix():
-- ldflags.append('-Wl,-s')
-- else:
-- ldflags.append('-Wl,-strip-all')
--
- # Enable identical code-folding.
- if options.use_icf:
- ldflags.append('-Wl,--icf=all')
-@@ -356,12 +345,12 @@ def WriteGNNinja(path, platform, host, options,
linux_sysroot):
- '-D_FILE_OFFSET_BITS=64',
- '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
- '-pthread',
-- '-pipe',
- '-fno-exceptions',
- '-fno-rtti',
- '-fdiagnostics-color',
- ])
- cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+ ldflags.extend(['-pthread'])
-
- if platform.is_linux():
- if linux_sysroot:
-@@ -369,14 +358,8 @@ def WriteGNNinja(path, platform, host, options,
linux_sysroot):
- cflags.append('--sysroot=' + linux_sysroot)
- ldflags.append('--sysroot=' + linux_sysroot)
- ldflags.extend([
-- '-static-libstdc++',
- '-Wl,--as-needed',
- ])
-- libs.extend([
-- # These are needed by libc++.
-- '-ldl',
-- '-lpthread',
-- ])
- elif platform.is_darwin():
- min_mac_version_flag = '-mmacosx-version-min=10.9'
- cflags.append(min_mac_version_flag)
---
-2.19.1
-
diff --git a/dev-util/gn/files/gn-numerics-arm.patch
b/dev-util/gn/files/gn-numerics-arm.patch
deleted file mode 100644
index f822cdb4085..00000000000
--- a/dev-util/gn/files/gn-numerics-arm.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 8952cb06749d4bd390991878281bc7e72a6eef2c Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <[email protected]>
-Date: Mon, 10 Dec 2018 10:27:20 -0500
-Subject: [PATCH] Add missing headers for ARM
-
-Bug: https://bugs.gentoo.org/672862
----
- base/numerics/safe_conversions_arm_impl.h | 51 +++++++++
- base/numerics/safe_math_arm_impl.h | 122 ++++++++++++++++++++++
- 2 files changed, 173 insertions(+)
- create mode 100644 base/numerics/safe_conversions_arm_impl.h
- create mode 100644 base/numerics/safe_math_arm_impl.h
-
-diff --git a/base/numerics/safe_conversions_arm_impl.h
b/base/numerics/safe_conversions_arm_impl.h
-new file mode 100644
-index 00000000..da5813f6
---- /dev/null
-+++ b/base/numerics/safe_conversions_arm_impl.h
-@@ -0,0 +1,51 @@
-+// Copyright 2017 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
-+#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
-+
-+#include <cassert>
-+#include <limits>
-+#include <type_traits>
-+
-+#include "base/numerics/safe_conversions_impl.h"
-+
-+namespace base {
-+namespace internal {
-+
-+// Fast saturation to a destination type.
-+template <typename Dst, typename Src>
-+struct SaturateFastAsmOp {
-+ static const bool is_supported =
-+ std::is_signed<Src>::value && std::is_integral<Dst>::value &&
-+ std::is_integral<Src>::value &&
-+ IntegerBitsPlusSign<Src>::value <= IntegerBitsPlusSign<int32_t>::value
&&
-+ IntegerBitsPlusSign<Dst>::value <= IntegerBitsPlusSign<int32_t>::value
&&
-+ !IsTypeInRangeForNumericType<Dst, Src>::value;
-+
-+ __attribute__((always_inline)) static Dst Do(Src value) {
-+ int32_t src = value;
-+ typename std::conditional<std::is_signed<Dst>::value, int32_t,
-+ uint32_t>::type result;
-+ if (std::is_signed<Dst>::value) {
-+ asm("ssat %[dst], %[shift], %[src]"
-+ : [dst] "=r"(result)
-+ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value <= 32
-+ ? IntegerBitsPlusSign<Dst>::value
-+ : 32));
-+ } else {
-+ asm("usat %[dst], %[shift], %[src]"
-+ : [dst] "=r"(result)
-+ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value < 32
-+ ? IntegerBitsPlusSign<Dst>::value
-+ : 31));
-+ }
-+ return static_cast<Dst>(result);
-+ }
-+};
-+
-+} // namespace internal
-+} // namespace base
-+
-+#endif // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
-diff --git a/base/numerics/safe_math_arm_impl.h
b/base/numerics/safe_math_arm_impl.h
-new file mode 100644
-index 00000000..a7cda1bb
---- /dev/null
-+++ b/base/numerics/safe_math_arm_impl.h
-@@ -0,0 +1,122 @@
-+// Copyright 2017 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
-+#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
-+
-+#include <cassert>
-+#include <limits>
-+#include <type_traits>
-+
-+#include "base/numerics/safe_conversions.h"
-+
-+namespace base {
-+namespace internal {
-+
-+template <typename T, typename U>
-+struct CheckedMulFastAsmOp {
-+ static const bool is_supported =
-+ FastIntegerArithmeticPromotion<T, U>::is_contained;
-+
-+ // The following is much more efficient than the Clang and GCC builtins for
-+ // performing overflow-checked multiplication when a twice wider type is
-+ // available. The below compiles down to 2-3 instructions, depending on the
-+ // width of the types in use.
-+ // As an example, an int32_t multiply compiles to:
-+ // smull r0, r1, r0, r1
-+ // cmp r1, r1, asr #31
-+ // And an int16_t multiply compiles to:
-+ // smulbb r1, r1, r0
-+ // asr r2, r1, #16
-+ // cmp r2, r1, asr #15
-+ template <typename V>
-+ __attribute__((always_inline)) static bool Do(T x, U y, V* result) {
-+ using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
-+ Promotion presult;
-+
-+ presult = static_cast<Promotion>(x) * static_cast<Promotion>(y);
-+ *result = static_cast<V>(presult);
-+ return IsValueInRangeForNumericType<V>(presult);
-+ }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedAddFastAsmOp {
-+ static const bool is_supported =
-+ BigEnoughPromotion<T, U>::is_contained &&
-+ IsTypeInRangeForNumericType<
-+ int32_t,
-+ typename BigEnoughPromotion<T, U>::type>::value;
-+
-+ template <typename V>
-+ __attribute__((always_inline)) static V Do(T x, U y) {
-+ // This will get promoted to an int, so let the compiler do whatever is
-+ // clever and rely on the saturated cast to bounds check.
-+ if (IsIntegerArithmeticSafe<int, T, U>::value)
-+ return saturated_cast<V>(x + y);
-+
-+ int32_t result;
-+ int32_t x_i32 = x;
-+ int32_t y_i32 = y;
-+
-+ asm("qadd %[result], %[first], %[second]"
-+ : [result] "=r"(result)
-+ : [first] "r"(x_i32), [second] "r"(y_i32));
-+ return saturated_cast<V>(result);
-+ }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedSubFastAsmOp {
-+ static const bool is_supported =
-+ BigEnoughPromotion<T, U>::is_contained &&
-+ IsTypeInRangeForNumericType<
-+ int32_t,
-+ typename BigEnoughPromotion<T, U>::type>::value;
-+
-+ template <typename V>
-+ __attribute__((always_inline)) static V Do(T x, U y) {
-+ // This will get promoted to an int, so let the compiler do whatever is
-+ // clever and rely on the saturated cast to bounds check.
-+ if (IsIntegerArithmeticSafe<int, T, U>::value)
-+ return saturated_cast<V>(x - y);
-+
-+ int32_t result;
-+ int32_t x_i32 = x;
-+ int32_t y_i32 = y;
-+
-+ asm("qsub %[result], %[first], %[second]"
-+ : [result] "=r"(result)
-+ : [first] "r"(x_i32), [second] "r"(y_i32));
-+ return saturated_cast<V>(result);
-+ }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedMulFastAsmOp {
-+ static const bool is_supported = CheckedMulFastAsmOp<T, U>::is_supported;
-+
-+ template <typename V>
-+ __attribute__((always_inline)) static V Do(T x, U y) {
-+ // Use the CheckedMulFastAsmOp for full-width 32-bit values, because
-+ // it's fewer instructions than promoting and then saturating.
-+ if (!IsIntegerArithmeticSafe<int32_t, T, U>::value &&
-+ !IsIntegerArithmeticSafe<uint32_t, T, U>::value) {
-+ V result;
-+ if (CheckedMulFastAsmOp<T, U>::Do(x, y, &result))
-+ return result;
-+ return CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y));
-+ }
-+
-+ assert((FastIntegerArithmeticPromotion<T, U>::is_contained));
-+ using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
-+ return saturated_cast<V>(static_cast<Promotion>(x) *
-+ static_cast<Promotion>(y));
-+ }
-+};
-+
-+} // namespace internal
-+} // namespace base
-+
-+#endif // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
---
-2.20.0.rc2
-
diff --git a/dev-util/gn/gn-0.1445.ebuild b/dev-util/gn/gn-0.1445.ebuild
deleted file mode 100644
index 8f8649a1043..00000000000
--- a/dev-util/gn/gn-0.1445.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/";
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/ninja
-"
-
-PATCHES=(
- "${FILESDIR}"/gn-gen-r0.patch
-)
-
-pkg_setup() {
- :
-}
-
-src_configure() {
- python_setup
- tc-export AR CC CXX
- set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
- echo "$@"
- "$@" || die
- cat >out/last_commit_position.h <<-EOF || die
- #ifndef OUT_LAST_COMMIT_POSITION_H_
- #define OUT_LAST_COMMIT_POSITION_H_
- #define LAST_COMMIT_POSITION "${PV}"
- #endif // OUT_LAST_COMMIT_POSITION_H_
- EOF
-}
-
-src_compile() {
- eninja -C out gn
-}
-
-src_test() {
- eninja -C out gn_unittests
- out/gn_unittests || die
-}
-
-src_install() {
- dobin out/gn
- einstalldocs
-}
diff --git a/dev-util/gn/gn-0.1479.ebuild b/dev-util/gn/gn-0.1479.ebuild
deleted file mode 100644
index 89fd565c959..00000000000
--- a/dev-util/gn/gn-0.1479.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/";
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vim-syntax"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/ninja
-"
-
-PATCHES=(
- "${FILESDIR}"/gn-gen-r2.patch
- "${FILESDIR}"/gn-numerics-arm.patch
-)
-
-pkg_setup() {
- :
-}
-
-src_configure() {
- python_setup
- tc-export AR CC CXX
- unset CFLAGS
- set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
- echo "$@"
- "$@" || die
- cat >out/last_commit_position.h <<-EOF || die
- #ifndef OUT_LAST_COMMIT_POSITION_H_
- #define OUT_LAST_COMMIT_POSITION_H_
- #define LAST_COMMIT_POSITION "${PV}"
- #endif // OUT_LAST_COMMIT_POSITION_H_
- EOF
-}
-
-src_compile() {
- eninja -C out gn
-}
-
-src_test() {
- eninja -C out gn_unittests
- out/gn_unittests || die
-}
-
-src_install() {
- dobin out/gn
- einstalldocs
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles
- doins -r tools/gn/misc/vim/{autoload,ftdetect,ftplugin,syntax}
- fi
-}
