[gentoo-portage-dev] [PATCH] Use env to find python
>From b3854bd9791bb21d7284ef6284a3fb7d4b585412 Mon Sep 17 00:00:00 2001 From: Sid Spry Date: Sun, 14 Jun 2020 23:29:46 -0500 Subject: [PATCH] Use env to find python To: gentoo-portage-dev@lists.gentoo.org --- bin/archive-conf | 2 +- bin/binhost-snapshot | 2 +- bin/check-implicit-pointer-usage.py | 2 +- bin/chmod-lite.py | 2 +- bin/chpathtool.py | 2 +- bin/clean_locks | 2 +- bin/dispatch-conf | 2 +- bin/dohtml.py | 2 +- bin/doins.py | 2 +- bin/ebuild | 2 +- bin/ebuild-ipc.py | 2 +- bin/egencache | 2 +- bin/emaint | 2 +- bin/emerge | 2 +- bin/emirrordist | 2 +- bin/env-update | 2 +- bin/filter-bash-environment.py | 2 +- bin/fixpackages | 2 +- bin/glsa-check | 2 +- bin/install.py | 2 +- bin/lock-helper.py | 2 +- bin/portageq | 2 +- bin/quickpkg | 2 +- bin/regenworld | 2 +- bin/xattr-helper.py | 2 +- bin/xpak-helper.py | 2 +- lib/portage/tests/runTests.py | 2 +- lib/portage/util/changelog.py | 2 +- runtests | 2 +- tabcheck.py | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bin/archive-conf b/bin/archive-conf index 8341ffe73..36a4da07a 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot index d677e7568..3726bb20a 100755 --- a/bin/binhost-snapshot +++ b/bin/binhost-snapshot @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py index a49db8107..5b3cec019 100755 --- a/bin/check-implicit-pointer-usage.py +++ b/bin/check-implicit-pointer-usage.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Ripped from HP and updated from Debian # Update by Gentoo to support unicode output diff --git a/bin/chmod-lite.py b/bin/chmod-lite.py index 177be7eab..c34c68912 100755 --- a/bin/chmod-lite.py +++ b/bin/chmod-lite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/chpathtool.py b/bin/chpathtool.py index fbd18b987..fb438e5ba 100755 --- a/bin/chpathtool.py +++ b/bin/chpathtool.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2011-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/clean_locks b/bin/clean_locks index 94ba4c606..c62d10b94 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 62ab3f6cc..9d22aae72 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/dohtml.py b/bin/dohtml.py index dfcaa6026..8505134c5 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/doins.py b/bin/doins.py index 6bc30c90b..8de480e81 100644 --- a/bin/doins.py +++ b/bin/doins.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --git a/bin/ebuild b/bin/ebuild index 460aa0fd1..fbc6ad177 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index d68d3f05e..02b59f5ef 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --git a/bin/egencache b/bin/egencache index d172319f8..6fb2fe0fe 100755 --- a/bin/egencache +++ b/bin/egencache @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2009-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/emaint b/bin/emaint index df904f7c0..d07e0d022 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,4 +1,4 @@ -#!/usr/bin/python -b +#!/usr/bin/env -S python -b # Copyright 2005-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/emerge b/bin/emerge index e372f5e9e..08f92b40e
[gentoo-dev] Automated Package Removal and Addition Tracker, for the week ending 2020-06-14 23:59 UTC
The attached list notes all of the packages that were added or removed from the tree, for the week ending 2020-06-14 23:59 UTC. Removals: acct-group/octoprint 20200614-08:28 mgorny 892989d763c acct-user/octoprint 20200614-08:28 mgorny ab28053f19e app-admin/pdk20200614-20:15 prometheanfire b3d38a79fc4 dev-go/go-protobuf 20200612-19:38 williamh 5f6e1a93c0b dev-python/addons20200614-08:31 mgorny 160d4044866 dev-python/bytecodeassembler 20200614-08:31 mgorny 8ac7c2950a8 dev-python/decoratortools20200614-08:31 mgorny 733a3c82008 dev-python/extremes 20200614-08:30 mgorny f1f8dd9620c dev-python/importing 20200614-08:30 mgorny 6310447bda5 dev-python/peak-rules20200614-08:30 mgorny a5c3a060d39 dev-python/pyprotocols 20200614-08:30 mgorny e74911f28ac dev-python/ramlfications 20200614-08:27 mgorny 93550eb06b1 dev-python/symboltype20200614-08:30 mgorny 9bc0f0c7df6 sys-kernel/spl 20200610-21:58 gyakovlev f1058995e5b www-apps/octoprint 20200614-08:27 mgorny 39167367a16 x11-libs/libXxf86misc20200608-17:28 mattst88 ba5e02f6957 Additions: acct-group/icingaweb220200609-17:50 prometheanfire affc6dfb97d acct-group/znc 20200513-18:24 sbraz b2eb57797f4 acct-user/znc20200513-18:32 sbraz 52f0c43fa2a dev-libs/libgnt 20200611-18:58 polynomial-c caf07e79987 dev-libs/rocclr 20200608-16:54 candrews 828795a9fd9 dev-python/argparse-manpage 20200612-00:38 chutzpah a3e80efa119 dev-python/fsspec20200614-11:56 mgorny 5e390682d8c dev-python/influxdb 20200611-13:52 juippis48003f4ea73 dev-python/loky 20200614-17:54 mgorny 72cd97ce4ae dev-python/sgmllib3k 20200612-14:26 mgorny b031a84bb8d dev-python/spur 20200612-11:14 mgorny a25c3337970 dev-ruby/middleware 20200613-05:06 graaff ab0d4572963 games-action/assault-android-cactus+ 20200610-20:38 chewi 4203b25ea0c mail-client/mutt-wizard 20200220-04:00 juippiscfb881f34b6 media-plugins/gst-plugins-webrtc 20200611-07:57 leio 5b5077592ef -- Robin Hugh Johnson Gentoo Linux Developer E-Mail : robb...@gentoo.org GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85 Removed Packages: app-admin/pdk,removed,prometheanfire,20200614-20:15,b3d38a79fc4 dev-python/addons,removed,mgorny,20200614-08:31,160d4044866 dev-python/bytecodeassembler,removed,mgorny,20200614-08:31,8ac7c2950a8 dev-python/decoratortools,removed,mgorny,20200614-08:31,733a3c82008 dev-python/extremes,removed,mgorny,20200614-08:30,f1f8dd9620c dev-python/importing,removed,mgorny,20200614-08:30,6310447bda5 dev-python/peak-rules,removed,mgorny,20200614-08:30,a5c3a060d39 dev-python/pyprotocols,removed,mgorny,20200614-08:30,e74911f28ac dev-python/symboltype,removed,mgorny,20200614-08:30,9bc0f0c7df6 acct-group/octoprint,removed,mgorny,20200614-08:28,892989d763c acct-user/octoprint,removed,mgorny,20200614-08:28,ab28053f19e www-apps/octoprint,removed,mgorny,20200614-08:27,39167367a16 dev-python/ramlfications,removed,mgorny,20200614-08:27,93550eb06b1 dev-go/go-protobuf,removed,williamh,20200612-19:38,5f6e1a93c0b sys-kernel/spl,removed,gyakovlev,20200610-21:58,f1058995e5b x11-libs/libXxf86misc,removed,mattst88,20200608-17:28,ba5e02f6957 Added Packages: dev-python/loky,added,mgorny,20200614-17:54,72cd97ce4ae dev-python/fsspec,added,mgorny,20200614-11:56,5e390682d8c dev-ruby/middleware,added,graaff,20200613-05:06,ab0d4572963 dev-python/sgmllib3k,added,mgorny,20200612-14:26,b031a84bb8d dev-python/spur,added,mgorny,20200612-11:14,a25c3337970 acct-user/znc,added,sbraz,20200513-18:32,52f0c43fa2a acct-group/znc,added,sbraz,20200513-18:24,b2eb57797f4 dev-python/argparse-manpage,added,chutzpah,20200612-00:38,a3e80efa119 dev-libs/libgnt,added,polynomial-c,20200611-18:58,caf07e79987 dev-python/influxdb,added,juippis,20200611-13:52,48003f4ea73 media-plugins/gst-plugins-webrtc,added,leio,20200611-07:57,5b5077592ef games-action/assault-android-cactus+,added,chewi,20200610-20:38,4203b25ea0c acct-group/icingaweb2,added,prometheanfire,20200609-17:50,affc6dfb97d dev-libs/rocclr,added,candrews,20200608-16:54,828795a9fd9 mail-client/mutt-wizard,added,juippis,20200220-04:00,cfb881f34b6 Done.
[gentoo-dev] Re: [PATCH 2/2] multilib.eclass: drop amd64 from maintainers
On Sun, 14 Jun 2020 11:57:06 -0400 Mike Gilbert wrote: > Acked-by: Agostino Sarubbo > Signed-off-by: Mike Gilbert > --- > eclass/multilib.eclass | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass > index 29d44768adec..4d1be867f14d 100644 > --- a/eclass/multilib.eclass > +++ b/eclass/multilib.eclass > @@ -3,7 +3,6 @@ > > # @ECLASS: multilib.eclass > # @MAINTAINER: > -# am...@gentoo.org > # toolch...@gentoo.org > # @BLURB: This eclass is for all functions pertaining to handling multilib > configurations. > # @DESCRIPTION: > -- > 2.27.0 > Looks good! -- Sergei
[gentoo-dev] Re: [PATCH 1/2] multilib.eclass: use tc-export to simplify multilib_toolchain_setup
On Sun, 14 Jun 2020 11:57:05 -0400
Mike Gilbert wrote:
> This also gives a tiny performance boost by reducing the number of
> subshells that are forked.
>
> Signed-off-by: Mike Gilbert
> ---
> eclass/multilib.eclass | 12
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
> index 342d21a2e1c3..29d44768adec 100644
> --- a/eclass/multilib.eclass
> +++ b/eclass/multilib.eclass
> @@ -506,19 +506,15 @@ multilib_toolchain_setup() {
> # Make sure ${save_restore_variables[@]} list matches below.
> export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
>
> - export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar'
> + # Append ABI flags to CHOST-prefixed tools
> export CC="$(tc-getCC) $(get_abi_CFLAGS)"
> export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
> export F77="$(tc-getF77) $(get_abi_CFLAGS)"
> export FC="$(tc-getFC) $(get_abi_CFLAGS)"
> export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
> - export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm'
> - export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use
> '${CHOST}-objdump'
> - export PKG_CONFIG="$(tc-getPKG_CONFIG)"
> - export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use
> '${CHOST}-ranlib'
> - export READELF="$(tc-getREADELF)" # Avoid 'readelf', use
> '${CHOST}-readelf'
> - export STRINGS="$(tc-getSTRINGS)" # Avoid 'strings', use
> '${CHOST}-strings'
> - export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use
> '${CHOST}-strip'
> +
> + # Use CHOST-prefixed tools
> + tc-export AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRINGS STRIP
>
> export CHOST=$(get_abi_CHOST $1)
> export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
> --
> 2.27.0
>
--
Sergei
[gentoo-dev] [PATCH 2/2] multilib.eclass: drop amd64 from maintainers
Acked-by: Agostino Sarubbo Signed-off-by: Mike Gilbert --- eclass/multilib.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 29d44768adec..4d1be867f14d 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -3,7 +3,6 @@ # @ECLASS: multilib.eclass # @MAINTAINER: -# am...@gentoo.org # toolch...@gentoo.org # @BLURB: This eclass is for all functions pertaining to handling multilib configurations. # @DESCRIPTION: -- 2.27.0
[gentoo-dev] [PATCH 1/2] multilib.eclass: use tc-export to simplify multilib_toolchain_setup
This also gives a tiny performance boost by reducing the number of
subshells that are forked.
Signed-off-by: Mike Gilbert
---
eclass/multilib.eclass | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 342d21a2e1c3..29d44768adec 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -506,19 +506,15 @@ multilib_toolchain_setup() {
# Make sure ${save_restore_variables[@]} list matches below.
export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
- export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar'
+ # Append ABI flags to CHOST-prefixed tools
export CC="$(tc-getCC) $(get_abi_CFLAGS)"
export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
export F77="$(tc-getF77) $(get_abi_CFLAGS)"
export FC="$(tc-getFC) $(get_abi_CFLAGS)"
export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
- export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm'
- export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use
'${CHOST}-objdump'
- export PKG_CONFIG="$(tc-getPKG_CONFIG)"
- export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use
'${CHOST}-ranlib'
- export READELF="$(tc-getREADELF)" # Avoid 'readelf', use
'${CHOST}-readelf'
- export STRINGS="$(tc-getSTRINGS)" # Avoid 'strings', use
'${CHOST}-strings'
- export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use
'${CHOST}-strip'
+
+ # Use CHOST-prefixed tools
+ tc-export AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRINGS STRIP
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
--
2.27.0
[gentoo-dev] [PATCH 2/2] multilib.eclass: populate STRINGS
For both multilib and non-multilib profiles binutils provides
tools with native CHOST prefix only. For example on amd64 there
is only 'x86_64-pc-linux-gnu-strings' and 'strings'.
autoconf usually uses AC_CHECK_TOOL(STRINGS, strings) autodetection
to discover either of these.
The change overrides STRINGS and friends to 'x86_64-pc-linux-gnu-strings'
for multilib setup similar to other environment variables.
Tested on media-libs/x264 and x11-libs/cairo packages.
Signed-off-by: Sergei Trofimovich
---
eclass/multilib.eclass | 4
1 file changed, 4 insertions(+)
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 54ff1509ead..342d21a2e1c 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -470,6 +470,7 @@ multilib_toolchain_setup() {
PKG_CONFIG
RANLIB
READELF
+ STRINGS
STRIP
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
@@ -504,6 +505,7 @@ multilib_toolchain_setup() {
#
# Make sure ${save_restore_variables[@]} list matches below.
export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
+
export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar'
export CC="$(tc-getCC) $(get_abi_CFLAGS)"
export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
@@ -515,7 +517,9 @@ multilib_toolchain_setup() {
export PKG_CONFIG="$(tc-getPKG_CONFIG)"
export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use
'${CHOST}-ranlib'
export READELF="$(tc-getREADELF)" # Avoid 'readelf', use
'${CHOST}-readelf'
+ export STRINGS="$(tc-getSTRINGS)" # Avoid 'strings', use
'${CHOST}-strings'
export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use
'${CHOST}-strip'
+
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
--
2.27.0
[gentoo-dev] [PATCH 1/2] toolchain-funcs.eclass: export tc-get*STRINGS helpers
Signed-off-by: Sergei Trofimovich
---
eclass/toolchain-funcs.eclass | 8
1 file changed, 8 insertions(+)
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index a88d9a114ff..ec7b920bcfa 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -73,6 +73,10 @@ tc-getCXX() { tc-getPROG CXX g++ "$@"; }
# @USAGE: [toolchain prefix]
# @RETURN: name of the linker
tc-getLD() { tc-getPROG LD ld "$@"; }
+# @FUNCTION: tc-getSTRINGS
+# @USAGE: [toolchain prefix]
+# @RETURN: name of the strings program
+tc-getSTRINGS() { tc-getPROG STRINGS strings "$@"; }
# @FUNCTION: tc-getSTRIP
# @USAGE: [toolchain prefix]
# @RETURN: name of the strip program
@@ -150,6 +154,10 @@ tc-getBUILD_CXX() { tc-getBUILD_PROG CXX g++ "$@"; }
# @USAGE: [toolchain prefix]
# @RETURN: name of the linker for building binaries to run on the build machine
tc-getBUILD_LD() { tc-getBUILD_PROG LD ld "$@"; }
+# @FUNCTION: tc-getBUILD_STRINGS
+# @USAGE: [toolchain prefix]
+# @RETURN: name of the strings program for building binaries to run on the
build machine
+tc-getBUILD_STRINGS() { tc-getBUILD_PROG STRINGS strings "$@"; }
# @FUNCTION: tc-getBUILD_STRIP
# @USAGE: [toolchain prefix]
# @RETURN: name of the strip program for building binaries to run on the build
machine
--
2.27.0
[gentoo-dev] Last rites: dev-python/hglib
# Michał Górny (2020-06-14) # Maintainer unresponsive. Stuck on py3.6. Pending version bump. # Failing tests. # Removal in 30 days. Bug #718990. dev-python/hglib -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: app-mobilephone/kannel, app-mobilephone/kannel-sqlbox
# Michał Górny (2020-06-14) # Unmaintained since at least 2014. The current release is 1.5 dev # branch from 2010. Upstream had a few stable 1.4 releases since # but 1.5 seems to be dead. Multiple build failures reported, # and an ebuild vulnerability. # Removal in 30 days. Bug #728186. app-mobilephone/kannel app-mobilephone/kannel-sqlbox -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-lang/ruby:2.4
# Hans de Graaff (2020-06-14) # Ruby 2.4 is no longer supported by upstream and no longer gets # security updates since the 2.4.10 release. Use ruby 2.5 or later # instead. dev-lang/ruby:2.4 dev-ruby/did_you_mean:2.4 signature.asc Description: This is a digitally signed message part
