Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Cc: James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 01/12] python-utils-r1.eclass: Fix some double slash paths
Date: Thu, 03 Jan 2019 21:40:22
Message-Id: 20190103213924.22835-2-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH] Eclass changes for cross-compiling Python modules by James Le Cuirot
1 If Python returns relative site or script directories then something
2 is very wrong!
3
4 Signed-off-by: James Le Cuirot <chewi@g.o>
5 ---
6 eclass/python-utils-r1.eclass | 8 ++++----
7 1 file changed, 4 insertions(+), 4 deletions(-)
8
9 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
10 index e3cf82b4b58f..da76a755fb34 100644
11 --- a/eclass/python-utils-r1.eclass
12 +++ b/eclass/python-utils-r1.eclass
13 @@ -1,4 +1,4 @@
14 -# Copyright 1999-2018 Gentoo Foundation
15 +# Copyright 1999-2019 Gentoo Authors
16 # Distributed under the terms of the GNU General Public License v2
17
18 # @ECLASS: python-utils-r1.eclass
19 @@ -797,11 +797,11 @@ python_newexe() {
20
21 # install the wrapper
22 _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
23 - "${ED%/}/${wrapd}/${newfn}" || die
24 + "${ED%/}${wrapd}/${newfn}" || die
25
26 # don't use this at home, just call python_doscript() instead
27 if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
28 - python_fix_shebang -q "${ED%/}/${d}/${newfn}"
29 + python_fix_shebang -q "${ED%/}${d}/${newfn}"
30 fi
31 }
32
33 @@ -927,7 +927,7 @@ python_domodule() {
34 doins -r "${@}" || return ${?}
35 )
36
37 - python_optimize "${ED%/}/${d}"
38 + python_optimize "${ED%/}${d}"
39 }
40
41 # @FUNCTION: python_doheader
42 --
43 2.19.2