From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-util/gn/Manifest | 8 ++--- dev-util/gn/files/gn-gen-r3.patch | 48 ----------------------------- dev-util/gn/files/gn-gen-r4.patch | 46 ++++++++++++++++++++++++++++ dev-util/gn/gn-0.1544.ebuild | 63 -------------------------------------- dev-util/gn/gn-0.1616.ebuild | 63 -------------------------------------- dev-util/gn/gn-0.1726.ebuild | 64 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 113 insertions(+), 179 deletions(-) delete mode 100644 dev-util/gn/files/gn-gen-r3.patch create mode 100644 dev-util/gn/files/gn-gen-r4.patch delete mode 100644 dev-util/gn/gn-0.1544.ebuild delete mode 100644 dev-util/gn/gn-0.1616.ebuild create mode 100644 dev-util/gn/gn-0.1726.ebuild (limited to 'dev-util/gn') diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest index 4dea2e7aa157..916effe0d626 100644 --- a/dev-util/gn/Manifest +++ b/dev-util/gn/Manifest @@ -1,9 +1,7 @@ AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993 -AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5 +AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281 -DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29 -DIST gn-0.1616.tar.xz 660332 BLAKE2B dab581d9f05cbe7ed91758d0ec68c61bd4e9fd0357b9cfa04f5276185ed6e810b37d9e2177cf3daec29e25633af2d32c6f733507a77cee7e37681bb977a59818 SHA512 42f68b40eebc423b785b1ba735548b3e5d2b64abd0dc1bb22940b9336c491308f062f547f81b5366c1dfe1f0e3bb41390ed3e3712637765cac1a50499a5e04d2 +DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790 -EBUILD gn-0.1544.ebuild 1202 BLAKE2B c4af8539a46361bedc5bb0d214b36c5fad5fff7e5fe541ad53db4dde9d322988461d826b4f3ce4d1888b3eb6a897d6332efff066f1b1a8b49d4c0beb8c90097a SHA512 4b6544fc24a36e926fa72eb7856cbd47d635ff9c800683105830d12b287b4edc3e410cdf8d74523602e94ee615bba8f650109b8eef930cb1dc65ded4c02a6624 -EBUILD gn-0.1616.ebuild 1206 BLAKE2B a86a974723a4f08f00f079fb201881e611a31482a6e739d19f13d49ad1ee1ad8000df1425dcfd6b4a073543ccf151eafa20d94c6173b2df26dae9a179a5bb149 SHA512 b45b2280e03ba74f60b48a6b719937efe1b88955cfd277f442b1ce555d1c2751f6babc1591d8ffad8747b296503cfc77001cf548948ce4f8c909f47d773bf7b2 +EBUILD gn-0.1726.ebuild 1263 BLAKE2B 45c9eca5d2bc2055effbaeb96b505bfa8a1049ba9a8fdc8f20be6d62cb8beaf69bd7dd367a2906b10f47d2803aae1ee7bfde251f9260fe96958b3c6e8f338848 SHA512 ac112856fb7bbe85a3dbb8af9b9e84a0ed87bb657d0bf95116962e666a7e8c23218889c59bc3e3621721ded93dd855e0d3839031ffcbc1ba1ba37c9bbc576115 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696 diff --git a/dev-util/gn/files/gn-gen-r3.patch b/dev-util/gn/files/gn-gen-r3.patch deleted file mode 100644 index 362a6854a264..000000000000 --- a/dev-util/gn/files/gn-gen-r3.patch +++ /dev/null @@ -1,48 +0,0 @@ -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-gen-r4.patch b/dev-util/gn/files/gn-gen-r4.patch new file mode 100644 index 000000000000..717c908f29dd --- /dev/null +++ b/dev-util/gn/files/gn-gen-r4.patch @@ -0,0 +1,46 @@ +From ad008cd029c995226fef36554e2e3cc657ef1380 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sat, 14 Mar 2020 18:02:51 +0000 +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 bcd9f15d..b48e844c 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -288,11 +288,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. +@@ -325,7 +320,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', +@@ -341,9 +335,6 @@ def WriteGNNinja(path, platform, host, options): + if not options.no_static_libstdcpp: + ldflags.append('-static-libstdc++') + +- # This is needed by libc++. +- if not platform.is_mingw(): +- libs.append('-ldl') + elif platform.is_darwin(): + min_mac_version_flag = '-mmacosx-version-min=10.9' + cflags.append(min_mac_version_flag) +-- +2.24.1 + diff --git a/dev-util/gn/gn-0.1544.ebuild b/dev-util/gn/gn-0.1544.ebuild deleted file mode 100644 index 2ab8a04093f4..000000000000 --- a/dev-util/gn/gn-0.1544.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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 ~arm64 ~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 -} diff --git a/dev-util/gn/gn-0.1616.ebuild b/dev-util/gn/gn-0.1616.ebuild deleted file mode 100644 index 4f6815837be9..000000000000 --- a/dev-util/gn/gn-0.1616.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,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.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~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 -} diff --git a/dev-util/gn/gn-0.1726.ebuild b/dev-util/gn/gn-0.1726.ebuild new file mode 100644 index 000000000000..2baaf308ab77 --- /dev/null +++ b/dev-util/gn/gn-0.1726.ebuild @@ -0,0 +1,64 @@ +# Copyright 2018-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,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.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="vim-syntax" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/ninja +" + +PATCHES=( + "${FILESDIR}"/gn-gen-r4.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 --no-static-libstdc++ + 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_NUM ${PV##0.} + #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 misc/vim/{autoload,ftdetect,ftplugin,syntax} + fi +} -- cgit v1.2.3