diff options
author | adam <adam@pkgsrc.org> | 2021-05-04 12:24:33 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2021-05-04 12:24:33 +0000 |
commit | d18bfc304a45a917f7ef6df326a1ed574c8d75d5 (patch) | |
tree | b5c5f680aa2c3cab3902f20331a1752e2e501f3d /archivers | |
parent | 56f57a513afb4b9177e3b35a5a4fbeb59bde93a0 (diff) | |
download | pkgsrc-d18bfc304a45a917f7ef6df326a1ed574c8d75d5.tar.gz |
py-zstandard: fix building with newer zstd
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/py-zstandard/distinfo | 3 | ||||
-rw-r--r-- | archivers/py-zstandard/patches/patch-c-ext_backend__c.c | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/archivers/py-zstandard/distinfo b/archivers/py-zstandard/distinfo index 3fd67e59d22..b02569f65a8 100644 --- a/archivers/py-zstandard/distinfo +++ b/archivers/py-zstandard/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.17 2021/02/28 18:35:32 adam Exp $ +$NetBSD: distinfo,v 1.18 2021/05/04 12:24:33 adam Exp $ SHA1 (zstandard-0.15.2.tar.gz) = 66ffb728d478d94a0d0f16bdfff23373b3b536bc RMD160 (zstandard-0.15.2.tar.gz) = 90309af02d82c8524c4d2b6eabdb5fb2cac46c27 SHA512 (zstandard-0.15.2.tar.gz) = 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f Size (zstandard-0.15.2.tar.gz) = 1012864 bytes +SHA1 (patch-c-ext_backend__c.c) = 0f8d95683b857bc1960d06a818bc6bee665354ab diff --git a/archivers/py-zstandard/patches/patch-c-ext_backend__c.c b/archivers/py-zstandard/patches/patch-c-ext_backend__c.c new file mode 100644 index 00000000000..aa7d365457b --- /dev/null +++ b/archivers/py-zstandard/patches/patch-c-ext_backend__c.c @@ -0,0 +1,25 @@ +$NetBSD: patch-c-ext_backend__c.c,v 1.1 2021/05/04 12:24:33 adam Exp $ + +Do not use hardcoded version number. + +--- c-ext/backend_c.c.orig 2021-02-27 19:38:19.000000000 +0000 ++++ c-ext/backend_c.c +@@ -152,15 +152,13 @@ void zstd_module_init(PyObject *m) { + PyObject *features = NULL; + PyObject *feature = NULL; + unsigned zstd_ver_no = ZSTD_versionNumber(); +- unsigned our_hardcoded_version = 10408; +- if (ZSTD_VERSION_NUMBER != our_hardcoded_version || +- zstd_ver_no != our_hardcoded_version) { ++ if (ZSTD_VERSION_NUMBER != zstd_ver_no) { + PyErr_Format( + PyExc_ImportError, + "zstd C API versions mismatch; Python bindings were not " + "compiled/linked against expected zstd version (%u returned by the " +- "lib, %u hardcoded in zstd headers, %u hardcoded in the cext)", +- zstd_ver_no, ZSTD_VERSION_NUMBER, our_hardcoded_version); ++ "lib, %u hardcoded in zstd headers)", ++ zstd_ver_no, ZSTD_VERSION_NUMBER); + return; + } + |