Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-python/pyinstaller/, dev-python/pyinstaller/files/
Date: Fri, 16 Apr 2021 12:58:50
Message-Id: 1618563021.347957bcbcbcdea2ea6c364c4766d0423627ed6d.andrewammerlaan@gentoo
1 commit: 347957bcbcbcdea2ea6c364c4766d0423627ed6d
2 Author: Theo Anderson <telans <AT> posteo <DOT> de>
3 AuthorDate: Fri Apr 16 08:46:16 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Fri Apr 16 08:50:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=347957bc
7
8 dev-python/pyinstaller: don't pre-strip binaries (take 2)
9
10 even when forcing waf to build bootloaders locally
11 and after removing all references to strip,
12 portage still complains. not sure what's going on here
13
14 Closes: https://bugs.gentoo.org/783090
15 Signed-off-by: Theo Anderson <telans <AT> posteo.de>
16
17 .../files/pyinstaller-4.2-dont-pre-strip.patch | 23 ----------------------
18 dev-python/pyinstaller/pyinstaller-4.2.ebuild | 2 +-
19 2 files changed, 1 insertion(+), 24 deletions(-)
20
21 diff --git a/dev-python/pyinstaller/files/pyinstaller-4.2-dont-pre-strip.patch b/dev-python/pyinstaller/files/pyinstaller-4.2-dont-pre-strip.patch
22 deleted file mode 100644
23 index ec6dcbbd4..000000000
24 --- a/dev-python/pyinstaller/files/pyinstaller-4.2-dont-pre-strip.patch
25 +++ /dev/null
26 @@ -1,23 +0,0 @@
27 ---- a/bootloader/wscript
28 -+++ b/bootloader/wscript
29 -@@ -652,11 +652,6 @@ def configure(ctx):
30 - if ctx.env.DEST_OS == 'linux' and ctx.check_cc(cflags='-Wl,--as-needed'):
31 - ctx.env.append_value('LINKFLAGS', '-Wl,--as-needed')
32 -
33 -- if ctx.env.CC_NAME != 'msvc':
34 -- # This tool allows reducing the size of executables.
35 -- ctx.find_program([assoc_programm(ctx, 'strip')], var='STRIP')
36 -- ctx.load('strip', tooldir='tools')
37 --
38 - def windowed(name, baseenv):
39 - """Setup windowed environment based on `baseenv`."""
40 - ctx.setenv(name, baseenv) # Inherit from `baseenv`.
41 -@@ -731,7 +726,7 @@ def build(ctx):
42 - includes='zlib')
43 -
44 - # By default strip final executables to make them smaller.
45 -- features = 'strip'
46 -+ features = ''
47 - if ctx.env.CC_NAME == 'msvc':
48 - # Do not strip bootloaders when using MSVC.
49 - features = ''
50
51 diff --git a/dev-python/pyinstaller/pyinstaller-4.2.ebuild b/dev-python/pyinstaller/pyinstaller-4.2.ebuild
52 index 4eeffc3d6..a9be3e283 100644
53 --- a/dev-python/pyinstaller/pyinstaller-4.2.ebuild
54 +++ b/dev-python/pyinstaller/pyinstaller-4.2.ebuild
55 @@ -16,4 +16,4 @@ LICENSE="GPL-2"
56 SLOT="0"
57 KEYWORDS="~amd64"
58
59 -PATCHES=( "${FILESDIR}/${PN}-4.2-dont-pre-strip.patch" )
60 +QA_PRESTRIPPED="usr/lib/python.*/site-packages/PyInstaller/bootloader/Linux-.*/run.*"