Request 2973 (accepted)

This request supersedes: request 2971 (Show diff)

Overview

Request 2973 (accepted)

Force `--buildsystem cmake` for Plesk PHP sub-builds as pybuild does not support custom `--builddirectory` values

Created by sicherha almost 2 years ago
In state accepted
Supersedes 2971

Submit libkolabxml

Submit package home:sicherha...ches:Kolab:16 / libkolabxml to package Kolab:16:Testing:Candidate / libkolabxml

debian.control Changed

debian.rules Changed

@@ -4,8 +4,6 @@
 PHPBIN := $(shell php-config --php-binary)
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
-PYTHON_SITEARCH := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
-
 
 PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
 
@@ -15,8 +13,8 @@
 export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed"
 
 %:
-	python utils/zonetabconversion.py
-	dh $@ --parallel --with python2
+	python3 utils/zonetabconversion.py
+	dh $@ --parallel --with python2,python3 --buildsystem=pybuild
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolabformat.substvars
@@ -55,7 +53,7 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			dh_auto_build --builddirectory php-$${version} ; \
+			dh_auto_build --buildsystem cmake --builddirectory php-$${version} ; \
 		done ; \
 	fi
 
@@ -79,8 +77,7 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			dh_auto_configure --builddirectory php-$${version} -- \
-				-DLIB_INSTALL_DIR=/usr/lib \
+			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- -DLIB_INSTALL_DIR=/usr/lib \
 				-DQT5_BUILD=ON \
 				-DBoost_NO_BOOST_CMAKE=TRUE \
 				-DSWIG=/usr/bin/swig \
@@ -101,8 +98,8 @@
 
 	grep kolabformat.i src/php/CMakeLists.txt
 
-	dh_auto_configure -- \
-		-DLIB_INSTALL_DIR=/usr/lib \
+	dh_auto_configure -- --configure-args \
+		"-DLIB_INSTALL_DIR=/usr/lib \
 		-DQT5_BUILD=ON \
 		-DBoost_NO_BOOST_CMAKE=TRUE \
 		-DPHP_BINDINGS=ON \
@@ -110,7 +107,7 @@
 		-DPHP_EXECUTABLE=$(PHPBIN) \
 		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
-		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
+		-DPYTHON_INSTALL_DIR={install_dir}"
 
 override_dh_install:
 	mkdir -p debian/tmp/usr/share/php

debian.tar.gz/python-kolabformat.install Changed

debian.tar.gz/python3-kolabformat.install Changed

libkolabxml.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2973 0

Request History

sicherha created request almost 2 years ago

Force `--buildsystem cmake` for Plesk PHP sub-builds as pybuild does not support custom `--builddirectory` values

mollekopf accepted request almost 2 years ago