pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-tables: Check headers-dir and lib-dir before hacking run-dir



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Mon Dec 2 07:39:01 2024 -0600
Changeset:	f10adb523ff6d5aedf09e42557422d52dd202b91

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

Log Message:
py-tables: Check headers-dir and lib-dir before hacking run-dir

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f10adb523ff6d5aedf09e42557422d52dd202b91

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

diffstat:
 py-tables/distinfo               | 2 +-
 py-tables/patches/patch-setup.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/py-tables/distinfo b/py-tables/distinfo
index 79161bac4d..97411ddb06 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) = 08a24f0d3e26c41d94493cc7e977d1dd49c36143
+SHA1 (patch-setup.py) = 4082648fb302669890aae49dcae49ef0630f5d60
diff --git a/py-tables/patches/patch-setup.py b/py-tables/patches/patch-setup.py
index 100c8b1d21..537421ee44 100644
--- a/py-tables/patches/patch-setup.py
+++ b/py-tables/patches/patch-setup.py
@@ -1,6 +1,6 @@
 $NetBSD$
 
-# Hack to fix PLIST issue on macOS
+# Hack to fix PLIST on macOS
 
 --- setup.py.orig	2024-08-17 08:56:33.000000000 +0000
 +++ setup.py
@@ -46,14 +46,14 @@ $NetBSD$
 +                if name == "blosc" or name == "blosc2":
 +                    print("directories = ", directories)
 +                    print("rundir (should be 'True') = ", directories[2])
-+                    sys.exit(1)
 +                    # 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.
-+                    directories[2] = True
++                    if directories[0] and directories[1]:
++                        directories[2] = True
          return tuple(directories)
  
  


Home | Main Index | Thread Index | Old Index