Update patch

This commit is contained in:
Susi Lehtola 2019-09-20 08:39:21 +02:00
parent 595d158b07
commit 55ec91cab7
2 changed files with 13 additions and 5 deletions

View File

@ -1,7 +1,7 @@
diff -up pybind11-2.2.3/pybind11/__init__.py.orig pybind11-2.2.3/pybind11/__init__.py diff -up pybind11-2.4.0/pybind11/__init__.py.nopip pybind11-2.4.0/pybind11/__init__.py
--- pybind11-2.2.3/pybind11/__init__.py.orig 2018-06-22 14:45:24.783361962 +0200 --- pybind11-2.4.0/pybind11/__init__.py.nopip 2019-09-19 23:06:22.000000000 +0200
+++ pybind11-2.2.3/pybind11/__init__.py 2018-06-22 14:46:31.708289349 +0200 +++ pybind11-2.4.0/pybind11/__init__.py 2019-09-20 08:38:31.351226101 +0200
@@ -1,28 +1,4 @@ @@ -1,36 +1,4 @@
from ._version import version_info, __version__ # noqa: F401 imported but unused from ._version import version_info, __version__ # noqa: F401 imported but unused
- -
@ -14,9 +14,17 @@ diff -up pybind11-2.2.3/pybind11/__init__.py.orig pybind11-2.2.3/pybind11/__init
- virtualenv = hasattr(sys, 'real_prefix') or \ - virtualenv = hasattr(sys, 'real_prefix') or \
- sys.prefix != getattr(sys, "base_prefix", sys.prefix) - sys.prefix != getattr(sys, "base_prefix", sys.prefix)
- -
- # Are we running in a conda environment?
- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
-
- if virtualenv: - if virtualenv:
- return os.path.join(sys.prefix, 'include', 'site', - return os.path.join(sys.prefix, 'include', 'site',
- 'python' + sys.version[:3]) - 'python' + sys.version[:3])
- elif conda:
- if os.name == 'nt':
- return os.path.join(sys.prefix, 'Library', 'include')
- else:
- return os.path.join(sys.prefix, 'include')
- else: - else:
- dist = Distribution({'name': 'pybind11'}) - dist = Distribution({'name': 'pybind11'})
- dist.parse_config_files() - dist.parse_config_files()

View File

@ -22,7 +22,7 @@ URL: https://github.com/pybind/pybind11
Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz
# Don't use pip to get path to headers # Don't use pip to get path to headers
Patch1: pybind11-2.2.3-nopip.patch Patch1: pybind11-2.4.0-nopip.patch
%if %{python2_enabled} %if %{python2_enabled}
# Needed to build the python libraries # Needed to build the python libraries