Request 2706 (accepted)

Overview

Request 2706 (accepted)

Fix jessie/plesk builds

Created by vanmeeuwen about 4 years ago
In state accepted

Submit libkolabxml

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

debian.changelog Changed

debian.rules Changed

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 PHPAPI := $(shell php-config --phpapi)
+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)')
@@ -35,7 +36,7 @@
 			echo "" >> debian/control ; \
 			sed -i -e "/Files:/ i\
  plesk-php$${shver}-kolabformat deb web extra" debian/control ; \
-			echo "opt/plesk/php/$${version}/lib/php/modules/*kolabformat.so" >> debian/plesk-php$${shver}-kolabformat.install ; \
+			echo "opt/plesk/php/$${version}/lib/php/modules/*.so" >> debian/plesk-php$${shver}-kolabformat.install ; \
 			echo "opt/plesk/php/$${version}/share/php/kolabformat.php" >> debian/plesk-php$${shver}-kolabformat.install ; \
 			echo "debian/kolabformat.ini opt/plesk/php/$${version}/etc/php.d" >> debian/plesk-php$${shver}-kolabformat.install ; \
 		done ; \
@@ -52,7 +53,7 @@
 			if [ $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ]; then \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
 			else \
-				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php5 -o/g' src/php/CMakeLists.txt ; \
+				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} ; \
 		done ; \
@@ -61,7 +62,7 @@
 	if [ $$(php-config --vernum) -gt 70000 ]; then \
 		sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
 	else \
-		sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php5 -o/g' src/php/CMakeLists.txt ; \
+		sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 	fi
 
 	dh_auto_build
@@ -76,13 +77,16 @@
 			if [ $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ]; then \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
 			else \
-				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php5 -o/g' src/php/CMakeLists.txt ; \
+				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 \
 				-DSWIG=/usr/bin/swig \
 				-DPHP_BINDINGS=ON \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
 				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
+				-DPHP_EXECUTABLE=/opt/plesk/php/$${version}/bin/php \
+				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
 				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir) ; \
 		done ; \
 	fi
@@ -96,15 +100,19 @@
 	grep kolabformat.i src/php/CMakeLists.txt
 
 	dh_auto_configure -- \
-		-DSWIG=/usr/bin/swig \
+		-DLIB_INSTALL_DIR=/usr/lib \
 		-DPHP_BINDINGS=ON \
+		-DPHP_INSTALL_DIR=$(PHPEXT) \
+		-DPHP_EXECUTABLE=$(PHPBIN) \
 		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
 		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
 
 override_dh_install:
 	mkdir -p debian/tmp/usr/share/php
-	if [ -d "/etc/php/7.3/mods-available/" ]; then \
+	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 \
 		echo "debian/kolabformat.ini etc/php/7.3/mods-available" >> debian/php-kolabformat.install ; \
 	elif [ -d "/etc/php/7.2/mods-available/" ]; then \
 		echo "debian/kolabformat.ini etc/php/7.2/mods-available" >> debian/php-kolabformat.install ; \
@@ -117,22 +125,31 @@
 	else \
 		echo "debian/kolabformat.ini etc/php5/mods-available" >> debian/php-kolabformat.install ; \
 	fi
-	mv debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
+	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 \
 			if [ ! -f "/opt/plesk/php/$${version}/bin/php-config" ]; then \
 				continue ; \
 			fi ; \
+			if [ $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ]; then \
+				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
+			else \
+				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
+			fi ; \
 			shver=$$(echo $${version} | sed -e 's/\.//g') ; \
 			make -C php-$${version} install DESTDIR=$(PWD)/debian/plesk-php$${shver}-kolabformat/ ; \
 			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
 			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/ ; \
 			cp -a debian/kolabformat.ini debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
-			mv debian/plesk-php$${shver}-kolabformat$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolabformat.php \
+			mv -v debian/plesk-php$${shver}-kolabformat$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolabformat.php \
 				debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/kolabformat.php ; \
-			rm -rf debian/plesk-php$${shver}-kolabformat/usr/ ; \
+			rm -rvf debian/plesk-php$${shver}-kolabformat/usr/ ; \
+			find debian/plesk-php$${shver}-kolabformat/ | sort ; \
 		done ; \
 	fi
 
 	dh_install --list-missing
+
+override_dh_auto_test:
+	dh_auto_test || :

debian.tar.gz/libkolabxml-dev.install Changed

debian.tar.gz/libkolabxml1v5.install Changed

libkolabxml.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2706 0

Request History

vanmeeuwen created request about 4 years ago

Fix jessie/plesk builds

vanmeeuwen accepted review about 4 years ago

vanmeeuwen approved review about 4 years ago

vanmeeuwen accepted request about 4 years ago