pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-tables: Different workaround for finding libblosc*.dylib
Module Name: pkgsrc-wip
Committed By: Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By: outpaddling
Date: Fri Dec 6 17:47:50 2024 -0600
Changeset: a85f47d1351861d18e32fd14393dd3f373e4182b
Modified Files:
py-tables/Makefile
py-tables/distinfo
py-tables/patches/patch-setup.py
Log Message:
py-tables: Different workaround for finding libblosc*.dylib
MAKE_ENV+=DY_LDLIBRARY_PATH=${PREFIX}/lib
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a85f47d1351861d18e32fd14393dd3f373e4182b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-tables/Makefile | 3 +++
py-tables/distinfo | 2 +-
py-tables/patches/patch-setup.py | 23 +++++++++++++++--------
3 files changed, 19 insertions(+), 9 deletions(-)
diffs:
diff --git a/py-tables/Makefile b/py-tables/Makefile
index bfd6365bf2..41c7550650 100644
--- a/py-tables/Makefile
+++ b/py-tables/Makefile
@@ -19,6 +19,9 @@ DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=4.4.0:../../devel/py-typing-extensio
USE_LANGUAGES= c c++
+# This allows libblosc*.dylib to be found by setup.py
+MAKE_ENV+= DYLD_LIBRARY_PATH=${PREFIX}/lib
+
post-install:
cd ${DESTDIR}${PREFIX}/bin && \
${MV} pt2to3 pt2to3-${PYVERSSUFFIX} && \
diff --git a/py-tables/distinfo b/py-tables/distinfo
index 97411ddb06..84b67ee2d8 100644
--- a/py-tables/distinfo
+++ b/py-tables/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.9 2024/10/23 22:55:52 wiz Exp $
BLAKE2s (tables-3.10.1.tar.gz) = 1150b460680ad8bad06e7fbf137cb576e80de0de2d0d5b1d3175df9ec3a7db2b
SHA512 (tables-3.10.1.tar.gz) = 7590dccefdd718d170ac288d391173ed540760a911f53fd39e37dd74237dc554f9363c8d9d4d518f067da299d71a1d8cb4a40134b1afaf79daa0a17de248caf5
Size (tables-3.10.1.tar.gz) = 4762413 bytes
-SHA1 (patch-setup.py) = 4082648fb302669890aae49dcae49ef0630f5d60
+SHA1 (patch-setup.py) = e8624f1a654ddb899e37478980ed10dd3e475dd7
diff --git a/py-tables/patches/patch-setup.py b/py-tables/patches/patch-setup.py
index 537421ee44..7eaa07d8be 100644
--- a/py-tables/patches/patch-setup.py
+++ b/py-tables/patches/patch-setup.py
@@ -1,10 +1,17 @@
$NetBSD$
-# Hack to fix PLIST on macOS
-
--- setup.py.orig 2024-08-17 08:56:33.000000000 +0000
+++ setup.py
-@@ -455,6 +455,10 @@ class BasePackage:
+@@ -363,6 +363,8 @@ class BasePackage:
+ # success occurred, so this returns True instead of a filename
+ for prefix in self._runtime_prefixes:
+ for suffix in self._runtime_suffixes:
++ print("find_runtime_path() trying ",
++ f"{prefix}{self.runtime_name}{suffix}")
+ try:
+ ctypes.CDLL(f"{prefix}{self.runtime_name}{suffix}")
+ except OSError:
+@@ -455,6 +457,10 @@ class BasePackage:
hook_dirs = hook() if hook is not None else [None, None, None]
@@ -15,7 +22,7 @@ $NetBSD$
directories = [None, None, None] # headers, libraries, runtime
for idx, (name, find_path, default_dirs) in enumerate(dirdata):
use_locations = (
-@@ -463,6 +467,7 @@ class BasePackage:
+@@ -463,6 +469,7 @@ class BasePackage:
or hook_dirs[idx]
or default_dirs
)
@@ -23,7 +30,7 @@ $NetBSD$
# pkgconfig does not list bin/ as the runtime dir
if (
name == "blosc" # blosc
-@@ -475,8 +480,12 @@ class BasePackage:
+@@ -475,8 +482,12 @@ class BasePackage:
use_locations = list(use_locations)
use_locations[0] = use_locations[0].parent / "bin"
print(f"Patching runtime dir: {str(use_locations[0])}")
@@ -36,7 +43,7 @@ $NetBSD$
if path is True:
directories[idx] = True
continue
-@@ -496,7 +505,19 @@ class BasePackage:
+@@ -496,7 +507,19 @@ class BasePackage:
directories[idx] = Path(path[: path.rfind(name)])
else:
directories[idx] = Path(path).parent
@@ -52,8 +59,8 @@ $NetBSD$
+ # headers and libs are found. When rundir is None,
+ # setup.py copyies libblosc into the py-tables
+ # installation, breaking PLIST.
-+ if directories[0] and directories[1]:
-+ directories[2] = True
++ # if directories[0] and directories[1]:
++ # directories[2] = True
return tuple(directories)
Home |
Main Index |
Thread Index |
Old Index