projects / packages / botan2.git / blame
| Commit | Line | Data |
|---|---|---|
| ac90ec63 JB |
1 | --- Botan-1.10.17/src/build-data/makefile/python.in.orig 2018-06-29 20:09:39.647157687 +0200 |
| 2 | +++ Botan-1.10.17/src/build-data/makefile/python.in 2018-06-29 20:09:44.253824302 +0200 | |
| 3 | @@ -3,11 +3,14 @@ | |
| 4 | LDFLAGS = | |
| 5 | WARN_FLAGS = %{warn_flags} | |
| 6 | ||
| 7 | +BOOST_PYTHON = boost_python | |
| 8 | +PY_VER = %{python_version} | |
| 9 | + | |
| 10 | SERIES = %{version_major}.%{version_minor} | |
| 11 | ||
| 12 | -PYTHON_ROOT = /usr/lib/python%{python_version}/config | |
| 13 | -PYTHON_INC = -I/usr/include/python%{python_version} | |
| 14 | -PYTHON_SITE_PACKAGE_DIR = /usr/lib/python%{python_version}/site-packages/ | |
| 15 | +PYTHON_ROOT = /usr/lib/python$(PY_VER)/config | |
| 16 | +PYTHON_INC = -I/usr/include/python$(PY_VER) | |
| 17 | +PYTHON_SITE_PACKAGE_DIR = /usr/lib/python$(PY_VER)/site-packages/ | |
| 18 | ||
| 19 | PYTHON_FLAGS = -I%{python_dir} -fPIC -ftemplate-depth-255 $(WARN_FLAGS) $(PYTHON_INC) $(CFLAGS) | |
| 20 | ||
| 21 | @@ -21,7 +24,7 @@ | |
| 22 | ||
| 23 | $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS) | |
| 24 | cp %{python_dir}/*.py $(BOTAN_PYTHON_MODDIR) | |
| 25 | - $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -lboost_python -o $@ | |
| 26 | + $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -l$(BOOST_PYTHON) -o $@ | |
| 27 | ||
| 28 | clean: | |
| 29 | rm -rf $(BOTAN_PYTHON_MODDIR)/* | |
| 30 | --- Botan-1.10.17/configure.py.orig 2017-10-02 08:00:00.000000000 +0200 | |
| 31 | +++ Botan-1.10.17/configure.py 2018-06-29 20:11:39.013822990 +0200 | |
| 32 | @@ -98,7 +98,7 @@ | |
| 33 | ||
| 34 | self.doc_output_dir = os.path.join(self.build_dir, 'docs') | |
| 35 | ||
| 36 | - self.pyobject_dir = os.path.join(self.build_dir, 'python') | |
| 37 | + self.pyobject_dir = os.path.join(self.build_dir, 'python$(PY_VER)') | |
| 38 | ||
| 39 | self.include_dir = os.path.join(self.build_dir, 'include') | |
| 40 | self.botan_include_dir = os.path.join(self.include_dir, 'botan') | |
| 41 | --- Botan-1.10.17/src/wrap/python/__init__.py.orig 2017-10-02 08:00:00.000000000 +0200 | |
| 42 | +++ Botan-1.10.17/src/wrap/python/__init__.py 2018-06-29 21:31:52.813768028 +0200 | |
| 43 | @@ -1,4 +1,4 @@ | |
| 44 | -from _botan import * | |
| 45 | +from botan._botan import * | |
| 46 | ||
| 47 | # Initialize the library when the module is imported | |
| 48 | init = LibraryInitializer() |