Created
May 3, 2024 19:11
-
-
Save pcd1193182/f177c2899219ad874fa45e61a6cf3d3b to your computer and use it in GitHub Desktop.
python fix, maybe
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit f660dfd33470d8c66e15417c8f8783898fb4d6bf | |
Author: Paul Dagnelie <pcd@delphix.com> | |
AuthorDate: Thu May 2 16:19:24 2024 -0700 | |
Commit: Paul Dagnelie <pcd@delphix.com> | |
CommitDate: Fri May 3 12:08:30 2024 -0700 | |
site pkg | |
Signed-off-by: Paul Dagnelie <pcd@delphix.com> | |
diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 | |
index 1f480db6d2..0646fc1ff3 100644 | |
--- a/config/ax_python_devel.m4 | |
+++ b/config/ax_python_devel.m4 | |
@@ -346,6 +346,8 @@ if hasattr(sysconfig, 'get_default_scheme'): | |
scheme = sysconfig.get_default_scheme() | |
else: | |
scheme = sysconfig._get_default_scheme() | |
+if 'deb_system' in sysconfig.get_scheme_names(): | |
+ scheme = 'deb_system' | |
if scheme == 'posix_local': | |
# Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ | |
scheme = 'posix_prefix' | |
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in | |
index a9b29f3ec5..1179c2001d 100644 | |
--- a/rpm/generic/zfs.spec.in | |
+++ b/rpm/generic/zfs.spec.in | |
@@ -87,7 +87,7 @@ | |
%define __python %{__use_python} | |
%define __python_pkg_version %{__use_python_pkg_version} | |
%endif | |
-%define __python_sitelib %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib())" 2>/dev/null || %{__python} -Esc "import sysconfig; print(sysconfig.get_path('purelib'))") | |
+%define __python_sitelib @PYTHON_SITE_PKG@ | |
Name: @PACKAGE@ | |
Version: @VERSION@ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment