Added back check() function

2 files changed, 78 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3fe101ef313..0f6a61627eaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = php81
 	pkgdesc = php 8.1.0 compiled as to not conflict with mainline php
 	pkgver = 8.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.php.net/
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index cd873ea576c2..58b32f119461 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Build props
 phpbase=81
 pkgver=8.1.0
-pkgrel=3
+pkgrel=4
 
 # Custom suffix
 suffix=
@@ -14,9 +14,8 @@ url='https://www.php.net/'
 _base="php"
 
 # Calculated
-program_suffix="${phpbase}${suffix}"
 pkgdesc="${_base} ${pkgver} compiled as to not conflict with mainline ${_base}"
-pkgbase="${_base}${program_suffix}"
+pkgbase="${_base}${phpbase}${suffix}"
 pkgname=("${pkgbase}" "${_base}${phpbase}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl,sodium}${suffix})
 
 makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
@@ -31,14 +30,15 @@ source=("https://php.net/distributions/${_base}-${pkgver}.tar.xz"
 name_libapache_source="libphp.so"
 name_libembed_source="libphp.so"
 
-# Dirs
-dir_config="etc/${pkgbase}"
-dir_lib="usr/lib/${pkgbase}"
+# Path
+path_prefix="usr"
+path_config="etc/${pkgbase}"
+path_extensions="${path_prefix}/lib/${pkgbase}/modules"
 
 # Binary names
-name_phpconfig="php-config${program_suffix}"
-name_phpize="phpize${program_suffix}"
-name_phar="phar${program_suffix}"
+name_phpconfig="php-config${phpbase}${suffix}"
+name_phpize="phpize${phpbase}${suffix}"
+name_phar="phar${phpbase}${suffix}"
 
 # Conf names
 name_apache_module_conf="${pkgbase/-/_}_module.conf"
@@ -57,22 +57,25 @@ build() {
     # http://site.icu-project.org/download/61#TOC-Migration-Issues
     #unset CPPFLAGS
     CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+    CPPFLAGS+=' -DEL_BUILD=1'
+    export EXTENSION_DIR="/${path_extensions}"
 
     local _phpconfig="--srcdir=../${_base}-${pkgver} \
         --config-cache \
-        --prefix=/usr \
-        --sbindir=/usr/bin \
-        --sysconfdir=/${dir_config} \
+        --cache-file=config-${pkgbase}-${pkgver}-${pkgrel}.cache
+        --prefix=/${path_prefix} \
+        --sbindir=/${path_prefix}/bin \
+        --sysconfdir=/${path_config} \
         --localstatedir=/var \
-        --libdir=/${dir_lib} \
-        --datarootdir=/usr/share/${pkgbase} \
-        --datadir=/usr/share/${pkgbase} \
-        --program-suffix=${program_suffix} \
+        --libdir=/${path_prefix}/lib/${pkgbase} \
+        --datarootdir=/${path_prefix}/share/${pkgbase} \
+        --datadir=/${path_prefix}/share/${pkgbase} \
+        --program-suffix=${phpbase}${suffix} \
         --with-layout=GNU \
-        --with-config-file-path=/${dir_config} \
-        --with-config-file-scan-dir=/${dir_config}/conf.d \
+        --with-config-file-path=/${path_config} \
+        --with-config-file-scan-dir=/${path_config}/conf.d \
         --disable-rpath \
-        --mandir=/usr/share/man \
+        --mandir=/${path_prefix}/share/man \
         --without-pear \
         "
 
@@ -94,7 +97,7 @@ build() {
         --enable-sysvshm=shared \
         --with-bz2=shared \
         --with-curl=shared \
-        --with-db4=/usr \
+        --with-db4=/${path_prefix} \
         --with-enchant=shared \
         --with-external-gd \
         --with-external-pcre \
@@ -113,9 +116,9 @@ build() {
         --with-mysqli=shared,mysqlnd \
         --with-openssl \
         --with-password-argon2 \
-        --with-pdo-dblib=shared,/usr \
+        --with-pdo-dblib=shared,/${path_prefix} \
         --with-pdo-mysql=shared,mysqlnd \
-        --with-pdo-odbc=shared,unixODBC,/usr \
+        --with-pdo-odbc=shared,unixODBC,/${path_prefix} \
         --with-pdo-pgsql=shared \
         --with-pdo-sqlite=shared \
         --with-pgsql=shared \
@@ -131,11 +134,15 @@ build() {
         --with-zip=shared \
         "
 
-    EXTENSION_DIR="/${dir_lib}/modules"
-    export EXTENSION_DIR
 
-    mkdir "${srcdir}/build"
+    # php
+    if [ ! -d "${srcdir}/build" ]; then
+        mkdir "${srcdir}/build"
+    fi
     cd "${srcdir}/build"
+    if [ -L configure ]; then
+       rm configure
+    fi
     ln -s ../${_base}-${pkgver}/configure
     ./configure ${_phpconfig} \
         --enable-cgi \
@@ -150,16 +157,16 @@ build() {
 
     # apache
     # reuse the previous run; this will save us a lot of time
-    cp -a ${srcdir}/build ${srcdir}/build-apache
-    cd ${srcdir}/build-apache
+    cp -a "${srcdir}/build" "${srcdir}/build-apache"
+    cd "${srcdir}/build-apache"
     ./configure ${_phpconfig} \
         --with-apxs2 \
         ${_phpextensions}
     make
 
     # phpdbg
-    cp -a ${srcdir}/build ${srcdir}/build-phpdbg
-    cd ${srcdir}/build-phpdbg
+    cp -a "${srcdir}/build" "${srcdir}/build-phpdbg"
+    cd "${srcdir}/build-phpdbg"
     ./configure ${_phpconfig} \
         --enable-phpdbg \
         ${_phpextensions}
@@ -185,42 +192,42 @@ check() {
 package_php81() {
     pkgdesc='A general-purpose scripting language that is especially suited to web development'
     depends=('libxml2' 'hspell' 'nuspell' 'libvoikko' 'curl' 'libzip' 'pcre2' 'argon2')
-    backup=("${dir_config}/php.ini")
+    backup=("etc/${pkgbase}/php.ini")
     #provides=("${pkgbase}=${pkgver}")
 
     cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
-    install -D -m644 ${srcdir}/${_base}-${pkgver}/php.ini-production ${pkgdir}/${dir_config}/php.ini
-    install -d -m755 ${pkgdir}/${dir_config}/conf.d/
+    install -D -m644 ${srcdir}/${_base}-${pkgver}/php.ini-production ${pkgdir}/${path_config}/php.ini
+    install -d -m755 ${pkgdir}/${path_config}/conf.d/
 
     # remove static modules
-    rm -f ${pkgdir}/${dir_lib}/modules/*.a
+    rm -f ${pkgdir}/${path_extensions}/*.a
     # remove modules provided by sub packages
-    rm -f ${pkgdir}/${dir_lib}/modules/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+    rm -f ${pkgdir}/${path_extensions}/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
     # remove empty directory
-    rmdir ${pkgdir}/usr/include/php/include
+    rmdir ${pkgdir}/${path_prefix}/include/php/include
 
     # move include directory
-    mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${pkgbase}
+    mv ${pkgdir}/${path_prefix}/include/php ${pkgdir}/${path_prefix}/include/${pkgbase}
 
     # fix phar symlink
-    #rm ${pkgdir}/usr/bin/phar  
-    ln -sf ${name_phar}.phar ${pkgdir}/usr/bin/${name_phar}
+    #rm ${pkgdir}/${path_prefix}/bin/phar  
+    ln -sf ${name_phar}.phar ${pkgdir}/${path_prefix}/bin/${name_phar}
 
     # rename executables
-    #mv ${pkgdir}/usr/bin/phar.phar ${pkgdir}/usr/bin/${name_phar}.phar
+    #mv ${pkgdir}/${path_prefix}/bin/phar.phar ${pkgdir}/${path_prefix}/bin/${name_phar}.phar
 
 
     # rename man pages
-    #mv ${pkgdir}/usr/share/man/man1/{phar,${name_phar}}.1
-    #mv ${pkgdir}/usr/share/man/man1/phar.{phar,${name_phar}}.1
+    #mv ${pkgdir}/${path_prefix}/share/man/man1/{phar,${name_phar}}.1
+    #mv ${pkgdir}/${path_prefix}/share/man/man1/phar.{phar,${name_phar}}.1
 
     # fix paths in executables
-    sed -i "/^includedir=/c \includedir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/${name_phpize}
-    sed -i "/^include_dir=/c \include_dir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/${name_phpconfig}
+    sed -i "/^includedir=/c \includedir=/${path_prefix}/include/${pkgbase}" ${pkgdir}/${path_prefix}/bin/${name_phpize}
+    sed -i "/^include_dir=/c \include_dir=/${path_prefix}/include/${pkgbase}" ${pkgdir}/${path_prefix}/bin/${name_phpconfig}
 
     # make phpize use php-config${phpbase}
-    sed -i "/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [${name_phpconfig}]], ${name_phpconfig}, no)" ${pkgdir}/${dir_lib}/build/phpize.m4
+    sed -i "/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [${name_phpconfig}]], ${name_phpconfig}, no)" ${pkgdir}/${path_prefix}/lib/${pkgbase}/build/phpize.m4
 }
 
 package_php81-cgi() {
@@ -237,26 +244,26 @@ package_php81-apache() {
     depends=("${pkgbase}" 'apache')
     backup=("etc/httpd/conf/extra/${name_apache_module_conf}")
     #provides=("${pkgbase}-apache=${pkgver}")
-        echo "# End of LoadModule in httpd.conf - see ArchWiki Apache HTTP Server"
-        echo "LoadModule php7_module modules/lib${pkgbase}.so"
-        echo "AddHandler php7-script .php"
-        echo "# End of Include List"
-        echo "Include conf/extra/${name_apache_module_conf}"
-    install -D -m755 ${srcdir}/build-apache/libs/${name_libapache_source} ${pkgdir}/usr/lib/httpd/modules/lib${pkgbase}.so
+    echo "# End of LoadModule in httpd.conf - see ArchWiki Apache HTTP Server"
+    echo "LoadModule php_module modules/lib${pkgbase}.so"
+    echo "AddHandler php-script .php"
+    echo "# End of Include List"
+    echo "Include conf/extra/${name_apache_module_conf}"
+    install -D -m755 ${srcdir}/build-apache/libs/${name_libapache_source} ${pkgdir}/${path_prefix}/lib/httpd/modules/lib${pkgbase}.so
     install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${name_apache_module_conf}
 }
 
 package_php81-fpm() {
     pkgdesc='FastCGI Process Manager for PHP'
     depends=("${pkgbase}" 'systemd')
-    backup=("${dir_config}/php-fpm.conf" "${dir_config}/php-fpm.d/www.conf")
+    backup=("etc/${pkgbase}/php-fpm.conf" "etc/${pkgbase}/php-fpm.d/www.conf")
     options=('!emptydirs')
     #provides=("${pkgbase}-fpm=${pkgver}")
 
     cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} install-fpm
-    install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/${pkgbase}-fpm.service
-    install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf
+    install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/${path_prefix}/lib/systemd/system/${pkgbase}-fpm.service
+    install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/${path_prefix}/lib/tmpfiles.d/${pkgbase}-fpm.conf
 }
 
 package_php81-embed() {
@@ -267,7 +274,7 @@ package_php81-embed() {
 
     cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
-    mv ${pkgdir}/usr/lib/${name_libembed_source} ${pkgdir}/usr/lib/libphp${program_suffix}.so
+    mv ${pkgdir}/${path_prefix}/lib/${name_libembed_source} ${pkgdir}/${path_prefix}/lib/libphp${phpbase}${suffix}.so
 }
 
 package_php81-phpdbg() {
@@ -285,7 +292,7 @@ package_php81-dblib() {
     depends=("${pkgbase}" 'freetds')
     #provides=("${pkgbase}-dblib=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/${dir_lib}/modules/pdo_dblib.so
+    install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/${path_extensions}/pdo_dblib.so
 }
 
 package_php81-enchant() {
@@ -293,7 +300,7 @@ package_php81-enchant() {
     depends=("${pkgbase}" 'enchant')
     #provides=("${pkgbase}-enchant=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/${dir_lib}/modules/enchant.so
+    install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/${path_extensions}/enchant.so
 }
 
 package_php81-gd() {
@@ -301,7 +308,7 @@ package_php81-gd() {
     depends=("${pkgbase}" 'gd')
     #provides=("${pkgbase}-gd=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/${dir_lib}/modules/gd.so
+    install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/${path_extensions}/gd.so
 }
 
 package_php81-imap() {
@@ -309,7 +316,7 @@ package_php81-imap() {
     depends=("${pkgbase}" 'c-client')
     #provides=("${pkgbase}-imap=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/${dir_lib}/modules/imap.so
+    install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/${path_extensions}/imap.so
 }
 
 package_php81-intl() {
@@ -317,7 +324,7 @@ package_php81-intl() {
     depends=("${pkgbase}" 'icu')
     #provides=("${pkgbase}-intl=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/${dir_lib}/modules/intl.so
+    install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/${path_extensions}/intl.so
 }
 
 package_php81-odbc() {
@@ -325,8 +332,8 @@ package_php81-odbc() {
     depends=("${pkgbase}" 'unixodbc')
     #provides=("${pkgbase}-odbc=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/${dir_lib}/modules/odbc.so
-    install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/${dir_lib}/modules/pdo_odbc.so
+    install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/${path_extensions}/odbc.so
+    install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/${path_extensions}/pdo_odbc.so
 }
 
 package_php81-pgsql() {
@@ -334,8 +341,8 @@ package_php81-pgsql() {
     depends=("${pkgbase}" 'postgresql-libs')
     #provides=("${pkgbase}-pgsql=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/${dir_lib}/modules/pgsql.so
-    install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/${dir_lib}/modules/pdo_pgsql.so
+    install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/${path_extensions}/pgsql.so
+    install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/${path_extensions}/pdo_pgsql.so
 }
 
 package_php81-pspell() {
@@ -343,7 +350,7 @@ package_php81-pspell() {
     depends=("${pkgbase}" 'aspell')
     #provides=("${pkgbase}-pspell=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/${dir_lib}/modules/pspell.so
+    install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/${path_extensions}/pspell.so
 }
 
 package_php81-snmp() {
@@ -351,36 +358,36 @@ package_php81-snmp() {
     depends=("${pkgbase}" 'net-snmp')
     #provides=("${pkgbase}-snmp=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/${dir_lib}/modules/snmp.so
+    install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/${path_extensions}/snmp.so
 }
 
 package_php81-sqlite() {
     pkgdesc='sqlite module for PHP'
     depends=("${pkgbase}" 'sqlite')
     #provides=("${pkgbase}-sqlite=${pkgver}")
-    install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/${dir_lib}/modules/sqlite3.so
-    install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/${dir_lib}/modules/pdo_sqlite.so
+    install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/${path_extensions}/sqlite3.so
+    install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/${path_extensions}/pdo_sqlite.so
 }
 
 package_php81-tidy() {
     pkgdesc='tidy module for PHP'
     depends=("${pkgbase}" 'tidy')
     #provides=("${pkgbase}-tidy=${pkgver}")
-    install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/${dir_lib}/modules/tidy.so
+    install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/${path_extensions}/tidy.so
 }
 
 package_php81-xsl() {
     pkgdesc='xsl module for PHP'
     depends=("${pkgbase}" 'libxslt')
     #provides=("${pkgbase}-xsl=${pkgver}")
-    install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/${dir_lib}/modules/xsl.so
+    install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/${path_extensions}/xsl.so
 }
 
 package_php81-sodium() {
     pkgdesc='sodium module for PHP'
     depends=("${pkgbase}" 'libsodium')
     #provides=("${pkgbase}-sodium=${pkgver}")
-    install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/${dir_lib}/modules/sodium.so
+    install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/${path_extensions}/sodium.so
 }