Overview

Request 2972 (accepted)

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


debian.rules Changed
x
 
1
@@ -53,7 +53,7 @@
2
            else \
3
                sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
4
            fi ; \
5
-           dh_auto_build --builddirectory php-$${version} ; \
6
+           dh_auto_build --buildsystem cmake --builddirectory php-$${version} ; \
7
        done ; \
8
    fi
9
 
10
@@ -77,8 +77,7 @@
11
            else \
12
                sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
13
            fi ; \
14
-           dh_auto_configure --builddirectory php-$${version} -- --configure-args \
15
-               "-DLIB_INSTALL_DIR=/usr/lib \
16
+           dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- -DLIB_INSTALL_DIR=/usr/lib \
17
                -DQT5_BUILD=ON \
18
                -DBoost_NO_BOOST_CMAKE=TRUE \
19
                -DSWIG=/usr/bin/swig \
20
@@ -87,7 +86,7 @@
21
                -DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
22
                -DPHP_EXECUTABLE=/opt/plesk/php/$${version}/bin/php \
23
                -DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
24
-               -DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)" ; \
25
+               -DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir) ; \
26
        done ; \
27
    fi
28
 
29
@@ -145,7 +144,7 @@
30
            mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/ ; \
31
            cp -a debian/kolabformat.ini debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
32
            mv -v debian/plesk-php$${shver}-kolabformat$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolabformat.php \
33
-               debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/kolabformat.php ; \
34
+               debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/kolabformat.php || exit 1; \
35
            rm -rvf debian/plesk-php$${shver}-kolabformat/usr/ ; \
36
            find debian/plesk-php$${shver}-kolabformat/ | sort ; \
37
        done ; \
38
@@ -154,4 +153,5 @@
39
    dh_install --list-missing
40
 
41
 override_dh_auto_test:
42
+    # Fails on ubuntu 20.04 and debian 10 because of missing qt libraries
43
    dh_auto_test || :
44
Refresh
Refresh
Request History
Christoph Erhardt's avatar

sicherha created request over 2 years ago

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


mollekopf's avatar

mollekopf accepted review over 2 years ago


mollekopf's avatar

mollekopf accepted request over 2 years ago