diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-08-22 01:04:40 +0800 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-08-22 01:04:40 +0800 |
| commit | b6cf9c19675b389d4a5b2c1fed1d11598280c1c8 (patch) | |
| tree | eb91fb3ccf621cf7a987702d5962d7f9d6f5418a /math/py-pyreadr/files | |
| parent | math/py-numexpr: Update to 2.8.5 (diff) | |
math/py-pyreadr: Update to 0.4.9
- Convert to USE_PYTHON=pep517
Changes: https://github.com/ofajardo/pyreadr/releases
https://github.com/ofajardo/pyreadr/blob/master/change_log.md
Diffstat (limited to 'math/py-pyreadr/files')
| -rw-r--r-- | math/py-pyreadr/files/patch-pyreadr-librdata.c | 24 | ||||
| -rw-r--r-- | math/py-pyreadr/files/patch-setup.py | 17 |
2 files changed, 21 insertions, 20 deletions
diff --git a/math/py-pyreadr/files/patch-pyreadr-librdata.c b/math/py-pyreadr/files/patch-pyreadr-librdata.c index a42f31378cf0..4f1e7dcff114 100644 --- a/math/py-pyreadr/files/patch-pyreadr-librdata.c +++ b/math/py-pyreadr/files/patch-pyreadr-librdata.c @@ -1,29 +1,29 @@ ---- pyreadr/librdata.c.orig 2022-09-24 13:35:34 UTC +--- pyreadr/librdata.c.orig 2023-08-09 09:41:49 UTC +++ pyreadr/librdata.c -@@ -4,8 +4,6 @@ - { +@@ -5,8 +5,6 @@ "distutils": { "depends": [ + "pyreadr/conditional_includes.h", - "pyreadr/libs/librdata/src/rdata.h", - "pyreadr/libs/librdata/src/rdata_io_unistd.h" ], "extra_compile_args": [ "-DHAVE_ZLIB", -@@ -23,13 +21,6 @@ +@@ -24,13 +22,6 @@ "name": "pyreadr.librdata", "sources": [ "pyreadr/librdata.pyx", +- "pyreadr/libs/librdata/src/rdata_write.c", - "pyreadr/libs/librdata/src/rdata_bits.c", -- "pyreadr/libs/librdata/src/rdata_io_unistd.c", +- "pyreadr/libs/librdata/src/rdata_read.c", +- "pyreadr/libs/librdata/src/rdata_parser.c", - "pyreadr/libs/librdata/src/CKHashTable.c", - "pyreadr/libs/librdata/src/rdata_error.c", -- "pyreadr/libs/librdata/src/rdata_read.c", -- "pyreadr/libs/librdata/src/rdata_write.c", -- "pyreadr/libs/librdata/src/rdata_parser.c" +- "pyreadr/libs/librdata/src/rdata_io_unistd.c" ] }, "module_name": "pyreadr.librdata" -@@ -645,8 +636,8 @@ static CYTHON_INLINE float __PYX_NAN() { +@@ -1117,8 +1108,8 @@ static CYTHON_INLINE float __PYX_NAN() { #include <time.h> #include <stdint.h> #include <sys/types.h> @@ -31,6 +31,6 @@ -#include "libs/librdata/src/rdata_io_unistd.h" +#include <rdata.h> +#include <rdata_io_unistd.h> - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> + #include "conditional_includes.h" + #include <string.h> + #ifdef _OPENMP diff --git a/math/py-pyreadr/files/patch-setup.py b/math/py-pyreadr/files/patch-setup.py index 546a07909986..9d4d9a7b11c6 100644 --- a/math/py-pyreadr/files/patch-setup.py +++ b/math/py-pyreadr/files/patch-setup.py @@ -1,23 +1,24 @@ ---- setup.py.orig 2021-06-07 06:47:51 UTC +--- setup.py.orig 2023-08-09 07:13:10 UTC +++ setup.py -@@ -13,7 +13,6 @@ from setuptools import setup, Extension +@@ -13,12 +13,7 @@ from setuptools import setup, Extension from Cython.Build import cythonize + import Cython +-cyver = int(Cython.__version__.split(".")[0]) +-if cyver < 3: +- raise Exception("cython 3.0.0 or newer is required") +- librdata_source_files = [] -librdata_source_files += glob.glob('pyreadr/libs/librdata/src/*.c') librdata_source_files += ['pyreadr/librdata.pyx'] library_dirs = [] -@@ -52,10 +51,11 @@ elif platform.system() == 'Windows': +@@ -54,7 +49,7 @@ elif platform.system() == 'Windows': libraries.append('bz2') libraries.append('lzma') -elif platform.system() == 'Linux': -+elif platform.system() == 'FreeBSD' or platform.system() == 'Linux': ++elif platform.system() == 'FreeBSD': libraries.append('z') libraries.append('bz2') libraries.append('lzma') -+ libraries.append('rdata') - #extra_compile_args.append("--std=gnu99") - else: - raise RuntimeError('Unsupported OS') |