| 1 |
commit: 68e2a1ddc8c7957a4b1eac527abcc67959ee514c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 20:53:28 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 20:53:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e2a1dd |
| 7 |
|
| 8 |
dev-python/kiwisolver: fix Darwin build |
| 9 |
|
| 10 |
Don't assume Clang. |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch | 16 ++++++++++++++++ |
| 16 |
dev-python/kiwisolver/kiwisolver-1.3.1.ebuild | 4 ++++ |
| 17 |
2 files changed, 20 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch b/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..a56770bb572 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch |
| 24 |
@@ -0,0 +1,16 @@ |
| 25 |
+Fix build on Darwin with GCC. May need some adjustment for LLVM/Clang, |
| 26 |
+but I couldn't find the docs for possible compiler name types (for now). |
| 27 |
+ |
| 28 |
+It'll likely need a hack in the ebuild anyway. |
| 29 |
+--- a/setup.py |
| 30 |
++++ b/setup.py |
| 31 |
+@@ -54,9 +54,6 @@ class BuildExt(build_ext): |
| 32 |
+ for ext in self.extensions: |
| 33 |
+ ext.include_dirs.insert(0, cppy.get_include()) |
| 34 |
+ ext.extra_compile_args = opts |
| 35 |
+- if sys.platform == 'darwin': |
| 36 |
+- ext.extra_compile_args += ['-stdlib=libc++'] |
| 37 |
+- ext.extra_link_args += ['-stdlib=libc++'] |
| 38 |
+ if (ct == 'msvc' and os.environ.get('KIWI_DISABLE_FH4')): |
| 39 |
+ # Disable FH4 Exception Handling implementation so that we don't |
| 40 |
+ # require VCRUNTIME140_1.dll. For more details, see: |
| 41 |
|
| 42 |
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild |
| 43 |
index 2d2ec37813a..d49c2b5c587 100644 |
| 44 |
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild |
| 45 |
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild |
| 46 |
@@ -19,4 +19,8 @@ RDEPEND=" |
| 47 |
>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}] |
| 48 |
" |
| 49 |
|
| 50 |
+PATCHES=( |
| 51 |
+ "${FILESDIR}/${PN}-1.3.1-darwin-build.patch" |
| 52 |
+) |
| 53 |
+ |
| 54 |
distutils_enable_tests pytest |
Archives