Changeset: 5b96e99a82a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5b96e99a82a1
Modified Files:
cmake/monetdb-defines.cmake
debian/rules
Branch: Jan2022
Log Message:
Pass Python module directory on cmake command line for Debian/Ubuntu.
diffs (26 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -302,10 +302,7 @@ macro(monetdb_configure_misc)
"PASSWORD_BACKEND invalid, choose one of MD5, SHA1, RIPEMD160, SHA224,
SHA256, SHA384, SHA512")
endif()
- if((${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND (EXISTS
"/usr/lib/python3/dist-packages"))
- # Debian and Ubuntu, system install
- set(PYTHON3_LIBDIR "lib/python3/dist-packages")
- else()
+ if(NOT DEFINED PYTHON3_LIBDIR)
# Used for installing testing python module (don't pass a location, else
we need to strip this again)
execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import sysconfig;
print(sysconfig.get_path('purelib', vars={'base': ''})[1:])"
RESULT_VARIABLE PY3_LIBDIR_CODE
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
+ -DPYTHON3_LIBDIR=lib/python3/dist-packages
-DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
