From a23eec221e3201b284b0e15930a8ee7463852af7 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Wed, 9 Dec 2020 10:56:20 +0100
Subject: [PATCH] New supported extensions for PHP 8.0: odbc

---
 data/supported-extensions |  2 +-
 install-php-extensions    | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/data/supported-extensions b/data/supported-extensions
index 7afd57b..f24f0cb 100644
--- a/data/supported-extensions
+++ b/data/supported-extensions
@@ -34,7 +34,7 @@ mssql 5.5 5.6
 mysql 5.5 5.6
 mysqli 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 oauth 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
-odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4
+odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 opencensus 7.0 7.1 7.2 7.3 7.4
 parallel 7.1 7.2 7.3 7.4
diff --git a/install-php-extensions b/install-php-extensions
index 4411ec1..235836e 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -1035,14 +1035,12 @@ installBundledModule() {
 			fi
 			;;
 		odbc)
-			if test $PHP_MAJMIN_VERSION -le 704; then
-				docker-php-source extract
-				cd /usr/src/php/ext/odbc
-				phpize
-				sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure
-				./configure --with-unixODBC=shared,/usr
-				cd - >/dev/null
-			fi
+			docker-php-source extract
+			cd /usr/src/php/ext/odbc
+			phpize
+			sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure
+			./configure --with-unixODBC=shared,/usr
+			cd - >/dev/null
 			;;
 		pdo_odbc)
 			docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr