Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
use pybuild
· 47d0bd8c
Michael R. Crusoe
authored
Dec 14, 2019
47d0bd8c
PARTIAL FIX: improve py3 compat
· 225e8a12
Michael R. Crusoe
authored
Dec 14, 2019
225e8a12
Show whitespace changes
Inline
Side-by-side
debian/patches/python3.patch
View file @
225e8a12
---
a
/Makefile
+++
b
/Makefile
@@ -59,9 +59,9 @@
compile_osx:
---
librcsb-core-wrapper.orig
/Makefile
+++
librcsb-core-wrapper
/Makefile
@@ -59,9 +59,9 @@
compile_lnx_38:
@sh -c 'cd ./$(UTIL_MODULE); \
export PIC=-fPIC; \
...
...
@@ -12,7 +12,7 @@
export WWPDB_BOOST_INC=/apps/boost_1_38_0/include/boost-1_38; \
export WWPDB_BOOST_PYTHON_LIB_DIR=/apps/boost_1_38_0/lib; \
export WWPDB_BOOST_PYTHON_LIB=boost_python-gcc41-mt-1_38; \
@@ -73,9 +73,9 @@
compile_lnx_38:
@@ -73,9 +73,9 @@
compile_lnx_41:
@sh -c 'cd ./$(UTIL_MODULE); \
export PIC=-fPIC; \
...
...
@@ -24,7 +24,7 @@
export WWPDB_BOOST_INC=/apps/boost/include/boost-1_41; \
export WWPDB_BOOST_PYTHON_LIB_DIR=/apps/boost/lib; \
export WWPDB_BOOST_PYTHON_LIB=boost_python-gcc41-mt-1_41; \
@@ -88,9 +88,9 @@
compile_lnx_41:
@@ -88,9 +88,9 @@
compile_wwpdb_py27:
@sh -c 'cd ./$(UTIL_MODULE); \
export PIC=-fPIC; \
...
...
@@ -36,3 +36,24 @@
export WWPDB_BOOST_INC=$(TOP_INSTALL_DIR)/include; \
export WWPDB_BOOST_PYTHON_LIB_DIR=$(TOP_INSTALL_DIR)/lib; \
export WWPDB_BOOST_PYTHON_LIB=boost_python-mt; \
--- librcsb-core-wrapper.orig/cctbx/scitbx/boost_python/container_conversions.h
+++ librcsb-core-wrapper/cctbx/scitbx/boost_python/container_conversions.h
@@ -150,13 +150,12 @@
|| PyTuple_Check(obj_ptr)
|| PyIter_Check(obj_ptr)
|| PyRange_Check(obj_ptr)
- || ( !PyString_Check(obj_ptr)
- && !PyUnicode_Check(obj_ptr)
- && ( obj_ptr->ob_type == 0
- || obj_ptr->ob_type->ob_type == 0
- || obj_ptr->ob_type->ob_type->tp_name == 0
+ || ( !PyUnicode_Check(obj_ptr)
+ && ( Py_TYPE(obj_ptr) == 0
+ || Py_TYPE(Py_TYPE(obj_ptr)) == 0
+ || Py_TYPE(Py_TYPE(obj_ptr))->tp_name == 0
|| std::strcmp(
- obj_ptr->ob_type->ob_type->tp_name,
+ Py_TYPE(Py_TYPE(obj_ptr))->tp_name,
"Boost.Python.class") != 0)
&& PyObject_HasAttrString(obj_ptr, "__len__")
&& PyObject_HasAttrString(obj_ptr, "__getitem__")))) return 0;
debian/rules
View file @
225e8a12
...
...
@@ -23,7 +23,7 @@ override_dh_auto_build-nopy:
$(MAKE) doc
override_dh_auto_build-py: override_dh_auto_build-nopy
dh_auto_build --sourcedirectory=wrapper/python
dh_auto_build --sourcedirectory=wrapper/python
--buildsystem=pybuild
override_dh_auto_install: override_dh_auto_install-nopy override_dh_auto_install-py
...
...
@@ -31,7 +31,7 @@ override_dh_auto_install-nopy:
# lkajan: there is no real install mechanism in the upstream sources
override_dh_auto_install-py:
dh_auto_install --sourcedirectory=wrapper/python
dh_auto_install --sourcedirectory=wrapper/python
--buildsystem=pybuild
override_dh_installdocs:
dh_installdocs
...
...