summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Lamskoy2024-03-27 16:38:48 +0200
committerEugene Lamskoy2024-03-27 16:38:48 +0200
commit4525b9cd7cccd2ea90959610aacf54ece767dba4 (patch)
tree5443608aede862ee6b29679797f90a2abd1aa02e
parent258d8b76f8a80c96e8a91e0a2a19687b4898fa34 (diff)
downloadaur-4525b9cd7cccd2ea90959610aacf54ece767dba4.tar.gz
removed autoconf2.70 dependency
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD6
-rw-r--r--php56-autoconf.patch16
3 files changed, 23 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f356196dc082..ecadb001c5a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-# Generated by makepkg 6.0.2
-# Sat Jan 27 18:22:59 UTC 2024
+# Generated by makepkg 6.1.0
+# Wed Mar 27 14:30:35 UTC 2024
pkgbase = php56
pkgdesc = PHP 5.6.40 compiled as to not conflict with mainline php
pkgver = 5.6.40
@@ -32,7 +32,6 @@ pkgbase = php56
makedepends = systemd-libs
makedepends = coreutils
makedepends = findutils
- makedepends = autoconf2.70
makedepends = libxslt
makedepends = e2fsprogs
makedepends = openssl
@@ -72,6 +71,7 @@ pkgbase = php56
source = https://php.net/distributions/php-5.6.40.tar.xz
source = php-libxml.patch
source = php55-phar-names.patch
+ source = php56-autoconf.patch
source = openssl-1.1.patch
source = openssl-sslv3-consts.patch
source = fpm-numeric-uid-gid.patch
@@ -96,6 +96,7 @@ pkgbase = php56
sha256sums = 1369a51eee3995d7fbd1c5342e5cc917760e276d561595b6052b21ace2656d1c
sha256sums = e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba
sha256sums = 70e3cc00d954fa2b466a0e8f356c68bbb1e92b36304deaffd34c53cb6ae5e979
+ sha256sums = 563f7858764ce344b5802808de5e253f0477b08de3346b74ed757ac24819458a
sha256sums = b0d40038d245196480cac04bf7fd18b1c5cdab5e1b75462035cb03a87fd22e08
sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
sha256sums = d175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242
diff --git a/PKGBUILD b/PKGBUILD
index 1e54b838bb90..220f0e19fcec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -139,6 +139,7 @@ source=(
"https://php.net/distributions/php-${pkgver}.tar.xz"
"php-libxml.patch"
"php55-phar-names.patch"
+ "php56-autoconf.patch"
"openssl-1.1.patch"
"openssl-sslv3-consts.patch"
"fpm-numeric-uid-gid.patch"
@@ -183,7 +184,6 @@ makedepends=(
"systemd-libs"
"coreutils"
"findutils"
- "autoconf2.70"
"libxslt"
"e2fsprogs"
"openssl"
@@ -221,6 +221,7 @@ arch=(
_patches=(
"php-libxml.patch"
"php55-phar-names.patch"
+ "php56-autoconf.patch"
"openssl-1.1.patch"
"openssl-sslv3-consts.patch"
"fpm-numeric-uid-gid.patch"
@@ -494,8 +495,6 @@ prepare() {
if ((_phpbase <= 53)); then
PHP_AUTOCONF="/usr/bin/autoconf-2.13" ./buildconf --force
- elif ((_phpbase > 53 && _phpbase <= 56)); then
- PHP_AUTOCONF="/usr/bin/autoconf-2.70" ./buildconf --force
else
./buildconf --force
fi
@@ -1573,6 +1572,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
'1369a51eee3995d7fbd1c5342e5cc917760e276d561595b6052b21ace2656d1c'
'e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba'
'70e3cc00d954fa2b466a0e8f356c68bbb1e92b36304deaffd34c53cb6ae5e979'
+ '563f7858764ce344b5802808de5e253f0477b08de3346b74ed757ac24819458a'
'b0d40038d245196480cac04bf7fd18b1c5cdab5e1b75462035cb03a87fd22e08'
'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
'd175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242'
diff --git a/php56-autoconf.patch b/php56-autoconf.patch
new file mode 100644
index 000000000000..b6d4cc1fb721
--- /dev/null
+++ b/php56-autoconf.patch
@@ -0,0 +1,16 @@
+--- a/TSRM/threads.m4
++++ b/TSRM/threads.m4
+@@ -133,12 +133,12 @@
+ ac_cv_pthreads_cflags=$flag
+ break
+ fi
+ done
+ fi
+-fi
+ ])
++fi
+.
+ AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ ac_cv_pthreads_lib=
+ if test "$pthreads_working" != "yes"; then
+ for lib in pthread pthreads c_r; do