From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:22:19 +0000 Subject: gentoo resync : 24.03.2019 --- dev-util/gn/Manifest | 10 +- dev-util/gn/files/gn-gen-r0.patch | 51 -------- dev-util/gn/files/gn-gen-r2.patch | 70 ----------- dev-util/gn/files/gn-gen-r3.patch | 48 ++++++++ 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 ---------- dev-util/gn/gn-0.1544.ebuild | 63 ++++++++++ 8 files changed, 114 insertions(+), 449 deletions(-) delete mode 100644 dev-util/gn/files/gn-gen-r0.patch delete mode 100644 dev-util/gn/files/gn-gen-r2.patch create mode 100644 dev-util/gn/files/gn-gen-r3.patch delete mode 100644 dev-util/gn/files/gn-numerics-arm.patch delete mode 100644 dev-util/gn/gn-0.1445.ebuild delete mode 100644 dev-util/gn/gn-0.1479.ebuild create mode 100644 dev-util/gn/gn-0.1544.ebuild (limited to 'dev-util/gn') diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest index a6dcc1d161dc..585c26aea9d3 100644 --- a/dev-util/gn/Manifest +++ b/dev-util/gn/Manifest @@ -1,11 +1,7 @@ -AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7 AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993 -AUX gn-gen-r2.patch 2410 BLAKE2B baec5c55e7fbcb2f98128ec8f43bcbc154b0cd8c5348ccbb964020d8ff36117d83078630ba6b952e6860e7dd7d99a0563a8eb7db39f9fea2b30b11a782c10029 SHA512 ca43a150c8f1902b4ae777a8b015403f2cddd63aa9597dc5f9c527928b6820264e4f9cce9179fedc739e12171e47076b05a8ea686107e7c7c9bf2eab4458bb04 -AUX gn-numerics-arm.patch 7056 BLAKE2B c14f25fa03b5d31aa057d0992ff408176168afef0acc4867f345b4f52b513fc726afb458e0a3e9b45340892e497c03cce1d9bf8da10c90c83d8f6a9cbb9aa031 SHA512 051508e5917775a6ae11d03c69cb4b5260b4eae35a805715204e121cc112f888ff6026a041a942fe49feb59b21a5c7e31cb1a07de63a3d365f7ca13cb13cffdd -DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06 +AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281 -DIST gn-0.1479.tar.gz 909494 BLAKE2B 5d7165371337be630b2d8dcfd8cd067358d56d8d82501288a56bc15955674f0528fde27056c13f32a2b908576a9e2f28529dec9cd1f259e964405874ce74e90f SHA512 2be22c95952f9993d3f89e932abc0ed08eb2e99a3659322d90bf953b1f68591303b3490e0e55bf3988b1226fefef0a5b7f5d3039eb9ef76e4fe36a2e538ef94a -EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006 +DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790 -EBUILD gn-0.1479.ebuild 1230 BLAKE2B b3207bdea28d83aef19a657017d8715d6ed8b730e479c3155b0f5b93f7e799f34841195f72b773292006197525cc33fe48b6fe5e08db169327d1f4a126dc2f96 SHA512 27f0e899a344f5ba7c30a84d229044632c86372c8308179bf6f6ecc66dca2a846c76c0b5e6d07440ac1d64db429097a0c8dd0cce3c33d0701eae35f547d3e21b +EBUILD gn-0.1544.ebuild 1195 BLAKE2B a8476c5c8a3c0cde6dc09e87635764327e95f550977a98d46e1bcfa21255775a95ae999390cb0bcebd60e801c7252fac48d64daf4ca0ea134d68a3cc1db1f457 SHA512 999dc0bc2ee0559259649e19a26372f858e7fb32ce2e3acbff486e890076864d702a3bf203f1e92e5dab54ad0a59895e2b13d691ccba47888d7c9f1c626a2ea4 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696 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 d30af3ab4ac6..000000000000 --- 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 701a317bf023..000000000000 --- 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 -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-gen-r3.patch b/dev-util/gn/files/gn-gen-r3.patch new file mode 100644 index 000000000000..362a6854a264 --- /dev/null +++ b/dev-util/gn/files/gn-gen-r3.patch @@ -0,0 +1,48 @@ +From bedf2161dea8cf4813fd14891feee2e8e8d5bf28 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 14 Oct 2018 20:34:07 -0400 +Subject: [PATCH] Remove unwanted cflags/ldflags parameters + +--- + build/gen.py | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/build/gen.py b/build/gen.py +index a7142fab..06d5e2b3 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -278,11 +278,6 @@ def WriteGNNinja(path, platform, host, options): + if options.debug: + cflags.extend(['-O0', '-g']) + else: +- cflags.append('-DNDEBUG') +- cflags.append('-O3') +- if options.no_strip: +- cflags.append('-g') +- 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. +@@ -311,7 +306,6 @@ def WriteGNNinja(path, platform, host, options): + '-D_FILE_OFFSET_BITS=64', + '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', + '-pthread', +- '-pipe', + '-fno-exceptions', + '-fno-rtti', + '-fdiagnostics-color', +@@ -320,11 +314,8 @@ def WriteGNNinja(path, platform, host, options): + + if platform.is_linux(): + ldflags.extend([ +- '-static-libstdc++', + '-Wl,--as-needed', + ]) +- # This is needed by libc++. +- libs.append('-ldl') + elif platform.is_darwin(): + min_mac_version_flag = '-mmacosx-version-min=10.9' + cflags.append(min_mac_version_flag) +-- +2.21.0 + 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 f822cdb40852..000000000000 --- 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 -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 -+#include -+#include -+ -+#include "base/numerics/safe_conversions_impl.h" -+ -+namespace base { -+namespace internal { -+ -+// Fast saturation to a destination type. -+template -+struct SaturateFastAsmOp { -+ static const bool is_supported = -+ std::is_signed::value && std::is_integral::value && -+ std::is_integral::value && -+ IntegerBitsPlusSign::value <= IntegerBitsPlusSign::value && -+ IntegerBitsPlusSign::value <= IntegerBitsPlusSign::value && -+ !IsTypeInRangeForNumericType::value; -+ -+ __attribute__((always_inline)) static Dst Do(Src value) { -+ int32_t src = value; -+ typename std::conditional::value, int32_t, -+ uint32_t>::type result; -+ if (std::is_signed::value) { -+ asm("ssat %[dst], %[shift], %[src]" -+ : [dst] "=r"(result) -+ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign::value <= 32 -+ ? IntegerBitsPlusSign::value -+ : 32)); -+ } else { -+ asm("usat %[dst], %[shift], %[src]" -+ : [dst] "=r"(result) -+ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign::value < 32 -+ ? IntegerBitsPlusSign::value -+ : 31)); -+ } -+ return static_cast(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 -+#include -+#include -+ -+#include "base/numerics/safe_conversions.h" -+ -+namespace base { -+namespace internal { -+ -+template -+struct CheckedMulFastAsmOp { -+ static const bool is_supported = -+ FastIntegerArithmeticPromotion::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 -+ __attribute__((always_inline)) static bool Do(T x, U y, V* result) { -+ using Promotion = typename FastIntegerArithmeticPromotion::type; -+ Promotion presult; -+ -+ presult = static_cast(x) * static_cast(y); -+ *result = static_cast(presult); -+ return IsValueInRangeForNumericType(presult); -+ } -+}; -+ -+template -+struct ClampedAddFastAsmOp { -+ static const bool is_supported = -+ BigEnoughPromotion::is_contained && -+ IsTypeInRangeForNumericType< -+ int32_t, -+ typename BigEnoughPromotion::type>::value; -+ -+ template -+ __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::value) -+ return saturated_cast(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(result); -+ } -+}; -+ -+template -+struct ClampedSubFastAsmOp { -+ static const bool is_supported = -+ BigEnoughPromotion::is_contained && -+ IsTypeInRangeForNumericType< -+ int32_t, -+ typename BigEnoughPromotion::type>::value; -+ -+ template -+ __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::value) -+ return saturated_cast(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(result); -+ } -+}; -+ -+template -+struct ClampedMulFastAsmOp { -+ static const bool is_supported = CheckedMulFastAsmOp::is_supported; -+ -+ template -+ __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::value && -+ !IsIntegerArithmeticSafe::value) { -+ V result; -+ if (CheckedMulFastAsmOp::Do(x, y, &result)) -+ return result; -+ return CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y)); -+ } -+ -+ assert((FastIntegerArithmeticPromotion::is_contained)); -+ using Promotion = typename FastIntegerArithmeticPromotion::type; -+ return saturated_cast(static_cast(x) * -+ static_cast(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 8f8649a10435..000000000000 --- 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 89fd565c9595..000000000000 --- 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 -} diff --git a/dev-util/gn/gn-0.1544.ebuild b/dev-util/gn/gn-0.1544.ebuild new file mode 100644 index 000000000000..92d8f91252f3 --- /dev/null +++ b/dev-util/gn/gn-0.1544.ebuild @@ -0,0 +1,63 @@ +# Copyright 2018-2019 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-r3.patch +) + +pkg_setup() { + : +} + +src_configure() { + python_setup + tc-export AR CC CXX + unset CFLAGS + set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip + echo "$@" >&2 + "$@" || 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 +} -- cgit v1.2.3