- fix build on 64bit and 11.3

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 31a69c1ba134bf77b437effa98feeaef56242a22..c34a31028561408b8836f377c264a243909c7700 100644 (file)
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -1,12 +1,6 @@
 FIND_PACKAGE (PythonLibs)
 FIND_PACKAGE (PythonInterp REQUIRED)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR)
-
-IF (NOT PYTHON_SITEDIR)
-    SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR})
-ENDIF (NOT PYTHON_SITEDIR)
-
-SET (PYTHON_INSTALL_DIR ${PYTHON_SITEDIR})
+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
 
 MESSAGE (STATUS "Python executable: ${PYTHON_EXECUTABLE}")
 MESSAGE (STATUS "Python installation dir: ${PYTHON_INSTALL_DIR}")

diff --git a/bindings/solv.i b/bindings/solv.i
index 63b9eabd82e93960aed206fd389c7f5cf702cccf..bf59ccb5d8cf91706ae30d3c8d77147eb175de32 100644 (file)
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -830,10 +830,12 @@ typedef struct {
   }
   %}
   void set_loadcallback(PyObject *callable) {
-    if ($self->loadcallback == loadcallback)
+    if ($self->loadcallback == loadcallback) {
       Py_DECREF($self->loadcallbackdata);
-    if (callable)
+    }
+    if (callable) {
       Py_INCREF(callable);
+    }
     pool_setloadcallback($self, callable ? loadcallback : 0, callable);
   }
 #endif