Request 3029 (accepted)

Overview

Request 3029 (accepted)

python3 support

Created by mollekopf over 1 year ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit libkolabxml

Submit package Kolab:16:Testing / libkolabxml to package Kolab:Winterfell / libkolabxml

debian.rules Changed

@@ -43,6 +43,7 @@
 	dh_gencontrol
 
 override_dh_auto_build:
+	# Build plesk php versions
 	if  -f /etc/plesk-release  ; then \
 		for version in $(PHP_VERSIONS) ; do \
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
@@ -57,12 +58,16 @@
 		done ; \
 	fi
 
+	# Build php vanilla
 	if  $$(php-config --vernum) -gt 70000 ; then \
 		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
 	else \
 		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 	fi
 
+	dh_auto_build --buildsystem cmake --builddirectory php-vanilla
+
+	# Build python versions via pybuild
 	dh_auto_build
 
 override_dh_auto_configure:
@@ -79,7 +84,7 @@
 			fi ; \
 			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- -DLIB_INSTALL_DIR=/usr/lib \
 				-DQT5_BUILD=ON \
-				-DBoost_NO_BOOST_CMAKE=TRUE \
+				-DBoost_NO_BOOST_CMAKE=ON \
 				-DSWIG=/usr/bin/swig \
 				-DPHP_BINDINGS=ON \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
@@ -90,6 +95,7 @@
 		done ; \
 	fi
 
+	# Configure php vanilla
 	if  $$(php-config --vernum) -gt 70000 ; then \
 		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
 	else \
@@ -98,19 +104,30 @@
 
 	grep kolabformat.i src/php/CMakeLists.txt
 
-	dh_auto_configure -- --configure-args \
-		"-DLIB_INSTALL_DIR=/usr/lib \
+	dh_auto_configure --buildsystem cmake --builddirectory php-vanilla -- \
+		-DLIB_INSTALL_DIR=/usr/lib \
 		-DQT5_BUILD=ON \
-		-DBoost_NO_BOOST_CMAKE=TRUE \
+		-DBoost_NO_BOOST_CMAKE=ON \
 		-DPHP_BINDINGS=ON \
 		-DPHP_INSTALL_DIR=$(PHPEXT) \
 		-DPHP_EXECUTABLE=$(PHPBIN) \
-		-DPHP_INCLUDE_DIR=$(PHPINC) \
+		-DPHP_INCLUDE_DIR=$(PHPINC)
+
+	# Configure python builds via pybuild
+	dh_auto_configure -- --configure-args \
+		"-DLIB_INSTALL_DIR=/usr/lib \
+		-DQT5_BUILD=ON \
+		-DBoost_NO_BOOST_CMAKE=ON \
 		-DPYTHON_BINDINGS=ON \
 		-DPYTHON_INSTALL_DIR={install_dir}"
 
 override_dh_install:
+	# Install the PHP modules manually, because they depend on the  PHP API version,
+	# which has to be determined dynamically, so we can't put it into an .install file.
 	mkdir -p debian/tmp/usr/share/php
+	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
+	mv -v debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
+
 	if  -d "/etc/php/7.4/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.4/mods-available" >> debian/php-kolabformat.install ; \
 	elif  -d "/etc/php/7.3/mods-available/" ; then \
@@ -126,7 +143,6 @@
 	else \
 		echo "debian/kolabformat.ini etc/php5/mods-available" >> debian/php-kolabformat.install ; \
 	fi
-	mv -v debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
 
 	if  -f /etc/plesk-release ; then \
 		for version in $(PHP_VERSIONS) ; do \

libkolabxml.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3029 0

Request History

mollekopf created request over 1 year ago

python3 support

mollekopf accepted request over 1 year ago