CVS commit: pkgsrc/math/py-tables

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Mon Dec  2 13:49:09 UTC 2024

Modified Files:
        pkgsrc/math/py-tables: distinfo
Added Files:
        pkgsrc/math/py-tables/patches: patch-setup.py

Log Message:
math/py-tables: Hack to fix PLIST issue on macOS

setup.py fails to set the runtime dir properly, leading to
the mistaken impression that blosc libraries were not found,
even though it correctly identified headers and libs.
Added a heavily documented temporary patch to override this
error.  Upstream is aware of the issue, but I suspect may
take a while to get a handle on it.
https://github.com/PyTables/PyTables/issues/1219


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/py-tables/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/py-tables/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-tables/distinfo
diff -u pkgsrc/math/py-tables/distinfo:1.9 pkgsrc/math/py-tables/distinfo:1.10
--- pkgsrc/math/py-tables/distinfo:1.9  Wed Oct 23 22:55:52 2024
+++ pkgsrc/math/py-tables/distinfo      Mon Dec  2 13:49:08 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2024/10/23 22:55:52 wiz Exp $
+$NetBSD: distinfo,v 1.10 2024/12/02 13:49:08 bacon 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

Added files:

Index: pkgsrc/math/py-tables/patches/patch-setup.py
diff -u /dev/null pkgsrc/math/py-tables/patches/patch-setup.py:1.1
--- /dev/null   Mon Dec  2 13:49:09 2024
+++ pkgsrc/math/py-tables/patches/patch-setup.py        Mon Dec  2 13:49:09 2024
@@ -0,0 +1,59 @@
+$NetBSD: patch-setup.py,v 1.1 2024/12/02 13:49:09 bacon Exp $
+
+# 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:
+ 
+         hook_dirs = hook() if hook is not None else [None, None, None]
+ 
++        print("locations = ", locations)
++        print("hook_dirs = ", hook_dirs)
++        print("pkgconfig_dirs = ", pkgconfig_dirs)
++
+         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:
+                 or hook_dirs[idx]
+                 or default_dirs
+             )
++            print("use_locations = ", use_locations)
+             # pkgconfig does not list bin/ as the runtime dir
+             if (
+                 name == "blosc"  # blosc
+@@ -475,8 +480,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])}")
++
++            # FIXME: path is coming up empty for blosc rundir on macOS,
++            # while returning True on other platforms.
+             path = find_path(use_locations)
+             if path:
++                print("path = ", path)
+                 if path is True:
+                     directories[idx] = True
+                     continue
+@@ -496,7 +505,19 @@ class BasePackage:
+                     directories[idx] = Path(path[: path.rfind(name)])
+                 else:
+                     directories[idx] = Path(path).parent
+-
++            else:
++                print("path is not set!!  This is a problem.")
++                if name == "blosc" or name == "blosc2":
++                    print("directories = ", directories)
++                    print("rundir (should be 'True') = ", directories[2])
++                    # FIXME: tables-3.10.1 hack
++                    # Forcing rundir to True for macOS.  This is a
++                    # hack, but it's the value it should have, since the
++                    # 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
+         return tuple(directories)
+ 
+