commit:     68e2a1ddc8c7957a4b1eac527abcc67959ee514c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 20:53:28 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 20:53:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e2a1dd

dev-python/kiwisolver: fix Darwin build

Don't assume Clang.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch | 16 ++++++++++++++++
 dev-python/kiwisolver/kiwisolver-1.3.1.ebuild            |  4 ++++
 2 files changed, 20 insertions(+)

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
new file mode 100644
index 00000000000..a56770bb572
--- /dev/null
+++ b/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch
@@ -0,0 +1,16 @@
+Fix build on Darwin with GCC. May need some adjustment for LLVM/Clang,
+but I couldn't find the docs for possible compiler name types (for now).
+
+It'll likely need a hack in the ebuild anyway.
+--- a/setup.py
++++ b/setup.py
+@@ -54,9 +54,6 @@ class BuildExt(build_ext):
+         for ext in self.extensions:
+             ext.include_dirs.insert(0, cppy.get_include())
+             ext.extra_compile_args = opts
+-            if sys.platform == 'darwin':
+-                ext.extra_compile_args += ['-stdlib=libc++']
+-                ext.extra_link_args += ['-stdlib=libc++']
+             if (ct == 'msvc' and os.environ.get('KIWI_DISABLE_FH4')):
+                 # Disable FH4 Exception Handling implementation so that we 
don't
+                 # require VCRUNTIME140_1.dll. For more details, see:

diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild 
b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
index 2d2ec37813a..d49c2b5c587 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
@@ -19,4 +19,8 @@ RDEPEND="
        >=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.3.1-darwin-build.patch"
+)
+
 distutils_enable_tests pytest

Reply via email to