From 29f117e0fb0f34ae0cf42690aa5e36a9ee0b0688 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 23 Feb 2021 18:25:07 +0100 Subject: [PATCH] Add support for tensor --- .github/workflows/test-extensions.yml | 1 + data/supported-extensions | 1 + install-php-extensions | 22 ++++++++++++++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-extensions.yml b/.github/workflows/test-extensions.yml index 4c89ce8..5afed62 100644 --- a/.github/workflows/test-extensions.yml +++ b/.github/workflows/test-extensions.yml @@ -63,6 +63,7 @@ jobs: - check_syntax_shell - check_syntax_php strategy: + fail-fast: true matrix: distro: - alpine3.7 diff --git a/data/supported-extensions b/data/supported-extensions index 02807b2..e378e52 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -83,6 +83,7 @@ sybase_ct 5.5 5.6 sysvmsg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 sysvsem 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 sysvshm 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +tensor 7.2 7.3 7.4 tidy 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 timezonedb 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 uopz 5.5 5.6 7.0 7.1 7.2 7.3 7.4 diff --git a/install-php-extensions b/install-php-extensions index c245763..c2a6b0d 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -884,6 +884,23 @@ buildRequiredPackageLists() { tdlib@debian) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile git cmake gperf zlib1g-dev $buildRequiredPackageLists_libssldev" ;; + tensor@alpine) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent lapack libexecinfo openblas" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile lapack-dev libexecinfo-dev openblas-dev" + if test $DISTRO_MAJMIN_VERSION -le 310; then + if ! stringInList --force-overwrite "$IPE_APK_FLAGS"; then + IPE_APK_FLAGS="$IPE_APK_FLAGS --force-overwrite" + fi + fi + ;; + tensor@debian) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent liblapacke libopenblas-base" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile liblapack-dev libopenblas-dev liblapacke-dev" + if test $DISTRO_VERSION_NUMBER -ge 10; then + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent gfortran-8" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libgfortran-8-dev" + fi + ;; tidy@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent tidyhtml-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile tidyhtml-dev" @@ -1103,7 +1120,7 @@ setTargetTriplet() { # The number of processors to be used getCompilationProcessorCount() { case "$1" in - amqp | bcmath | bz2 | calendar | decimal | excimer | exif | gd | geospatial | gettext | gmagick | grpc | http | imagick | intl | mysqli | opcache | pcntl | pdo_mysql | protobuf | raphf | redis | ssh2 | soap | sockets | tidy | xdebug | xmlrpc | xsl | yaml | zip) + amqp | bcmath | bz2 | calendar | decimal | excimer | exif | gd | geospatial | gettext | gmagick | grpc | http | imagick | intl | mysqli | opcache | pcntl | pdo_mysql | protobuf | raphf | redis | ssh2 | soap | sockets | tensor | tidy | xdebug | xmlrpc | xsl | yaml | zip) # These extensions support parallel compilation getProcessorCount ;; @@ -1125,7 +1142,7 @@ installRequiredPackages() { case "$DISTRO" in alpine) - apk add $PACKAGES_PERSISTENT $PACKAGES_VOLATILE + apk add $IPE_APK_FLAGS $PACKAGES_PERSISTENT $PACKAGES_VOLATILE ;; debian) DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y $PACKAGES_PERSISTENT $PACKAGES_VOLATILE @@ -2444,6 +2461,7 @@ mkdir -p /tmp/src mkdir -p /tmp/pickle.tmp IPE_ERRFLAG_FILE="$(mktemp -p /tmp/src)" CONFIGURE_FILE=/tmp/configure-options +IPE_APK_FLAGS='' setDistro case "$DISTRO_VERSION" in debian@8)