| 1 |
commit: f2ace74dcbe808f7c6a6abd29d625f415602a633 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Tue Apr 21 01:17:42 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 5 16:49:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ace74d |
| 7 |
|
| 8 |
sci-libs/cantera: Fix site-packages install paths |
| 9 |
|
| 10 |
Python 3.7 and 3.8 site-packages dirs are located under /lib |
| 11 |
for amd64 arch now (instead of /lib64 like for python2.7 and python3.6) |
| 12 |
so the changes for python installation patch is required. |
| 13 |
|
| 14 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 15 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 16 |
|
| 17 |
sci-libs/cantera/cantera-2.4.0-r5.ebuild | 6 +++--- |
| 18 |
.../files/cantera_2.4.0_env_python_install_prefix.patch | 17 +++++++++++++++++ |
| 19 |
2 files changed, 20 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild |
| 22 |
index 78f23ee905b..e4d8b7de2c0 100644 |
| 23 |
--- a/sci-libs/cantera/cantera-2.4.0-r5.ebuild |
| 24 |
+++ b/sci-libs/cantera/cantera-2.4.0-r5.ebuild |
| 25 |
@@ -52,9 +52,9 @@ DEPEND=" |
| 26 |
|
| 27 |
PATCHES=( |
| 28 |
"${FILESDIR}/${PN}_${PV}_env.patch" |
| 29 |
- "${FILESDIR}/${PN}_${PV}_env_python_install.patch" |
| 30 |
+ "${FILESDIR}/${PN}_${PV}_env_python_install_prefix.patch" |
| 31 |
"${FILESDIR}/${PN}_${PV}_sundials4.patch" |
| 32 |
- ) |
| 33 |
+) |
| 34 |
|
| 35 |
pkg_setup() { |
| 36 |
fortran-2_pkg_setup |
| 37 |
@@ -107,7 +107,7 @@ src_test() { |
| 38 |
} |
| 39 |
|
| 40 |
src_install() { |
| 41 |
- escons install stage_dir="${D}" libdirname="$(get_libdir)" |
| 42 |
+ escons install stage_dir="${D}" libdirname="$(get_libdir)" python3_prefix="$(python_get_sitedir)" |
| 43 |
if ! use cti ; then |
| 44 |
rm -r "${D}/usr/share/man" || die "Can't remove man files." |
| 45 |
else |
| 46 |
|
| 47 |
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch |
| 48 |
new file mode 100644 |
| 49 |
index 00000000000..83890799636 |
| 50 |
--- /dev/null |
| 51 |
+++ b/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch |
| 52 |
@@ -0,0 +1,17 @@ |
| 53 |
+diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript |
| 54 |
+--- old/interfaces/cython/SConscript 2018-08-24 16:24:45.000000000 +0300 |
| 55 |
++++ new/interfaces/cython/SConscript 2019-08-14 04:28:41.000000000 +0300 |
| 56 |
+@@ -83,10 +83,10 @@ |
| 57 |
+ extra = '' |
| 58 |
+ elif localenv['OS'] == 'Darwin': |
| 59 |
+ extra = localenv.subst(' --prefix=${python%s_prefix}' % major) |
| 60 |
+- elif localenv['libdirname'] == 'lib64': |
| 61 |
+- # 64-bit RHEL / Fedora |
| 62 |
++ elif localenv['libdirname'] != 'lib': |
| 63 |
++ # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile |
| 64 |
+ extra = localenv.subst( |
| 65 |
+- ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor)) |
| 66 |
++ ' --prefix=${stage_dir}${prefix} --install-lib=${python%s_prefix}' % (major)) |
| 67 |
+ else: |
| 68 |
+ extra = '--user' |
| 69 |
+ localenv.AppendENVPath( |
Archives