Fix extension definitions --build-all

shivammathur · Nov 3, 2022 · a55e560 · a55e560
1 parent 091bd48
commit a55e560
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 35 deletions.
diff --git a/config/definitions/5.6 b/config/definitions/5.6
@@ -8,7 +8,6 @@
 --enable-exif=shared
 --enable-fileinfo=shared
 --enable-filter
---with-ffi=shared
 --enable-ftp=shared
 --with-openssl-dir=/usr
 --with-gettext=shared,/usr
@@ -32,20 +31,27 @@
 --with-tidy=shared,/usr
 --enable-tokenizer=shared
 --with-xsl=shared
---with-zip=shared
+
+# zip
+--enable-zip=shared
+--with-libzip=/usr
 
 # dba
 --enable-dba=shared
 --with-db4=/usr
 --without-gdbm
 --with-qdbm=/usr
---with-lmdb=/usr
 --enable-inifile
 --enable-flatfile
 
 # gd
---enable-gd=shared,/usr
---with-external-gd
+--with-gd=shared,/usr
+--enable-gd-native-ttf
+--with-jpeg-dir=/usr
+--with-xpm-dir=/usr/X11R6
+--with-png-dir=/usr
+--with-freetype-dir=/usr
+--with-webp-dir=/usr
 
 # mhash
 --with-mhash=/usr
@@ -86,10 +92,6 @@
 --enable-soap=shared
 --enable-libxml
 
-# sodium
---with-sodium=shared
---with-password-argon2=/usr
-
 # sqlite
 --with-sqlite3=shared
 --with-pdo-sqlite=shared

diff --git a/config/definitions/7.0 b/config/definitions/7.0
@@ -8,7 +8,6 @@
 --enable-exif=shared
 --enable-fileinfo=shared
 --enable-filter
---with-ffi=shared
 --enable-ftp=shared
 --with-openssl-dir=/usr
 --with-gettext=shared,/usr
@@ -32,20 +31,28 @@
 --with-tidy=shared,/usr
 --enable-tokenizer=shared
 --with-xsl=shared
---with-zip=shared
+
+# zip
+--enable-zip=shared
+--with-libzip=/usr
 
 # dba
 --enable-dba=shared
 --with-db4=/usr
 --without-gdbm
 --with-qdbm=/usr
---with-lmdb=/usr
 --enable-inifile
 --enable-flatfile
 
 # gd
---enable-gd=shared,/usr
---with-external-gd
+--with-gd=shared,/usr
+--enable-gd-native-ttf
+--with-jpeg-dir=/usr
+--with-xpm-dir=/usr/X11R6
+--with-png-dir=/usr
+--with-freetype-dir=/usr
+--with-webp-dir=/usr
+
 
 # mhash
 --with-mhash=/usr
@@ -86,10 +93,6 @@
 --enable-soap=shared
 --enable-libxml
 
-# sodium
---with-sodium=shared
---with-password-argon2=/usr
-
 # sqlite
 --with-sqlite3=shared
 --with-pdo-sqlite=shared

diff --git a/config/definitions/7.1 b/config/definitions/7.1
@@ -8,7 +8,6 @@
 --enable-exif=shared
 --enable-fileinfo=shared
 --enable-filter
---with-ffi=shared
 --enable-ftp=shared
 --with-openssl-dir=/usr
 --with-gettext=shared,/usr
@@ -32,20 +31,27 @@
 --with-tidy=shared,/usr
 --enable-tokenizer=shared
 --with-xsl=shared
---with-zip=shared
+
+# zip
+--enable-zip=shared
+--with-libzip=/usr
 
 # dba
 --enable-dba=shared
 --with-db4=/usr
 --without-gdbm
 --with-qdbm=/usr
---with-lmdb=/usr
 --enable-inifile
 --enable-flatfile
 
 # gd
---enable-gd=shared,/usr
---with-external-gd
+--with-gd=shared,/usr
+--enable-gd-native-ttf
+--with-jpeg-dir=/usr
+--with-xpm-dir=/usr/X11R6
+--with-png-dir=/usr
+--with-freetype-dir=/usr
+--with-webp-dir=/usr
 
 # mhash
 --with-mhash=/usr
@@ -86,10 +92,6 @@
 --enable-soap=shared
 --enable-libxml
 
-# sodium
---with-sodium=shared
---with-password-argon2=/usr
-
 # sqlite
 --with-sqlite3=shared
 --with-pdo-sqlite=shared

diff --git a/config/definitions/7.2 b/config/definitions/7.2
@@ -8,7 +8,6 @@
 --enable-exif=shared
 --enable-fileinfo=shared
 --enable-filter
---with-ffi=shared
 --enable-ftp=shared
 --with-openssl-dir=/usr
 --with-gettext=shared,/usr
@@ -32,7 +31,10 @@
 --with-tidy=shared,/usr
 --enable-tokenizer=shared
 --with-xsl=shared
---with-zip=shared
+
+# zip
+--enable-zip=shared
+--with-libzip=/usr
 
 # dba
 --enable-dba=shared
@@ -44,8 +46,13 @@
 --enable-flatfile
 
 # gd
---enable-gd=shared,/usr
---with-external-gd
+--with-gd=shared,/usr
+--enable-gd-native-ttf
+--with-jpeg-dir=/usr
+--with-xpm-dir=/usr/X11R6
+--with-png-dir=/usr
+--with-freetype-dir=/usr
+--with-webp-dir=/usr
 
 # mhash
 --with-mhash=/usr

diff --git a/config/definitions/7.3 b/config/definitions/7.3
@@ -8,7 +8,6 @@
 --enable-exif=shared
 --enable-fileinfo=shared
 --enable-filter
---with-ffi=shared
 --enable-ftp=shared
 --with-openssl-dir=/usr
 --with-gettext=shared,/usr
@@ -32,7 +31,10 @@
 --with-tidy=shared,/usr
 --enable-tokenizer=shared
 --with-xsl=shared
---with-zip=shared
+
+# zip
+--enable-zip=shared
+--with-libzip=/usr
 
 # dba
 --enable-dba=shared
@@ -44,8 +46,13 @@
 --enable-flatfile
 
 # gd
---enable-gd=shared,/usr
---with-external-gd
+--with-gd=shared,/usr
+--enable-gd-native-ttf
+--with-jpeg-dir=/usr
+--with-xpm-dir=/usr/X11R6
+--with-png-dir=/usr
+--with-freetype-dir=/usr
+--with-webp-dir=/usr
 
 # mhash
 --with-mhash=/usr

diff --git a/scripts/install-requirements.sh b/scripts/install-requirements.sh
@@ -257,6 +257,7 @@ install_packages apache2 \
                  libwrap0-dev \
                  libxml2-dev \
                  libxmltok1-dev \
+                 libxpm-dev \
                  libxslt1-dev \
                  libzip-dev \
                  libzstd-dev \