mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-12 14:50:08 +02:00
50 lines
1.7 KiB
Plaintext
50 lines
1.7 KiB
Plaintext
From b6e0d70785f85e4a8b9ab61b37f684ad0eca4d28 Mon Sep 17 00:00:00 2001
|
|
From: Aleksei Gerasimov <aleksei.gerasimov@vutbr.cz>
|
|
Date: Thu, 15 Oct 2020 14:13:11 +0200
|
|
Subject: disable ndimage
|
|
|
|
|
|
diff --git a/scipy/setup.py b/scipy/setup.py
|
|
index 3bcdd48..b3ede6f 100644
|
|
--- a/scipy/setup.py
|
|
+++ b/scipy/setup.py
|
|
@@ -21,7 +21,7 @@ def configuration(parent_package='',top_path=None):
|
|
config.add_subpackage('spatial')
|
|
config.add_subpackage('special')
|
|
config.add_subpackage('stats')
|
|
- config.add_subpackage('ndimage')
|
|
+ #config.add_subpackage('ndimage')
|
|
config.add_subpackage('_build_utils')
|
|
config.add_subpackage('_lib')
|
|
config.make_config_py()
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From f9e25e090297e27de3395bab18f104c70358d9ec Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Mon, 24 May 2021 18:40:26 +0000
|
|
Subject: Haiku doesn't use -pthread, use -lpthread instead
|
|
|
|
|
|
diff --git a/scipy/fft/_pocketfft/setup.py b/scipy/fft/_pocketfft/setup.py
|
|
index 7e44565..3b0ead2 100644
|
|
--- a/scipy/fft/_pocketfft/setup.py
|
|
+++ b/scipy/fft/_pocketfft/setup.py
|
|
@@ -15,9 +15,9 @@ def pre_build_hook(build_ext, ext):
|
|
'int main(int argc, char **argv) {}')
|
|
if has_pthreads:
|
|
ext.define_macros.append(('POCKETFFT_PTHREADS', None))
|
|
- if has_flag(cc, '-pthread'):
|
|
- args.append('-pthread')
|
|
- ext.extra_link_args.append('-pthread')
|
|
+ if has_flag(cc, '-lpthread'):
|
|
+ args.append('-lpthread')
|
|
+ ext.extra_link_args.append('-lpthread')
|
|
else:
|
|
raise RuntimeError("Build failed: System has pthreads header "
|
|
"but could not compile with -pthread option")
|
|
--
|
|
2.30.2
|
|
|