From c9ebe98a61df6ba8ffa9b0915741af51601629cf Mon Sep 17 00:00:00 2001 From: pataar Date: Wed, 30 Jun 2021 10:27:13 +0200 Subject: [PATCH] Use maven instead of ant when building zookeeper Test: zookeeper --- install-php-extensions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install-php-extensions b/install-php-extensions index 6e707ee..752a443 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -48,7 +48,7 @@ fi # Reset the Internal Field Separator resetIFS() { - IFS=' + IFS=' ' } @@ -968,7 +968,7 @@ buildRequiredPackageLists() { ;; zookeeper@alpine) if ! test -f /usr/local/include/zookeeper/zookeeper.h; then - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile apache-ant automake libtool openjdk8" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile maven automake libtool openjdk8" fi ;; zookeeper@debian) @@ -1359,7 +1359,7 @@ installBundledModule() { + PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) - + EOF fi docker-php-ext-configure dba --with-db4 @@ -2209,7 +2209,7 @@ installRemoteModule() { fi installRemoteModule_src="$(getPackageSource https://downloads.apache.org/zookeeper/stable/$installRemoteModule_tmp)" cd -- "$installRemoteModule_src" - ant compile_jute + mvn -pl zookeeper-jute compile cd - >/dev/null cd -- "$installRemoteModule_src/zookeeper-client/zookeeper-client-c" autoreconf -if @@ -2506,4 +2506,4 @@ for PHP_MODULE_TO_INSTALL in $PHP_MODULES_TO_INSTALL; do installRemoteModule "$PHP_MODULE_TO_INSTALL" fi done -cleanup +cleanup \ No newline at end of file