From e43ca0655f1a696dc9742a498296f84519a35d60 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Tue, 10 Sep 2024 21:21:39 +0200
Subject: [PATCH] testing/php84-pecl-apcu: rebuild using patch

---
 testing/php84-pecl-apcu/APKBUILD        |  4 +++-
 testing/php84-pecl-apcu/fix-build.patch | 30 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 testing/php84-pecl-apcu/fix-build.patch

diff --git a/testing/php84-pecl-apcu/APKBUILD b/testing/php84-pecl-apcu/APKBUILD
index bc70a573216..f454a0e65b1 100644
--- a/testing/php84-pecl-apcu/APKBUILD
+++ b/testing/php84-pecl-apcu/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php84-pecl-apcu
 _extname=apcu
 pkgver=5.1.23
-pkgrel=0
+pkgrel=1
 pkgdesc="PHP 8.4 extension APC User Cache - PECL"
 url="https://pecl.php.net/package/apcu"
 arch="all"
@@ -14,6 +14,7 @@ depends="$_php-common"
 makedepends="$_php-dev"
 checkdepends="$_php-pcntl"
 source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
+	fix-build.patch
 	fix-test.patch"
 builddir="$srcdir/$_extname-$pkgver"
 provides="$_php-apcu=$pkgver-r$pkgrel" # for backward compatibility
@@ -47,5 +48,6 @@ package() {
 
 sha512sums="
 89e9f10f5d8d1a9503132e80140680be2a10d96f957f69b2f77cc1c496d15cc26dfe4c0368ebe46c72c68d1b4a794d3ddc95942b02d3ba5e8c971b09969058d8  php-pecl-apcu-5.1.23.tgz
+686adb8210ab92424fc00e7d7ea67afb7705e9dadc30927a90babafb83835ec7ad0a676c9fca57dcd004a1f5b1d37d5458e7dd8065f2a08687fde91813190e06  fix-build.patch
 3c110f4310aa80eb4262c2a9609e3f1a0bbf210f564b609ad148bf92044c630797a2b86406224a52bcd0d92d8c698bedb88d9d1e0444757eb798303772383b9f  fix-test.patch
 "
diff --git a/testing/php84-pecl-apcu/fix-build.patch b/testing/php84-pecl-apcu/fix-build.patch
new file mode 100644
index 00000000000..17457a11cf9
--- /dev/null
+++ b/testing/php84-pecl-apcu/fix-build.patch
@@ -0,0 +1,30 @@
+Patch-Source: https://github.com/krakjoe/apcu/commit/103bb842f4dc5e9a52137277ddfb12937b30c3cd
+From 103bb842f4dc5e9a52137277ddfb12937b30c3cd Mon Sep 17 00:00:00 2001
+From: Peter Kokot <peterkokot@gmail.com>
+Date: Sat, 31 Aug 2024 19:12:49 +0200
+Subject: [PATCH] Autotools: Replace APCU_CFLAGS Makefile variable with shell
+ variable
+
+This replaces the "hacky" Makefile variable usage in config.m4 with a
+regular shell variable.
+
+Issue initially noted at https://github.com/php/php-src/pull/15642
+---
+ config.m4 | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index a6e5c991..2b8782a7 100644
+--- a/config.m4
++++ b/config.m4
+@@ -246,9 +246,8 @@ if test "$PHP_APCU" != "no"; then
+                  apc_persist.c"
+ 
+   PHP_CHECK_LIBRARY(rt, shm_open, [PHP_ADD_LIBRARY(rt,,APCU_SHARED_LIBADD)])
+-  PHP_NEW_EXTENSION(apcu, $apc_sources, $ext_shared,, \\$(APCU_CFLAGS))
++  PHP_NEW_EXTENSION([apcu], [$apc_sources], [$ext_shared],, [$APCU_CFLAGS])
+   PHP_SUBST(APCU_SHARED_LIBADD)
+-  PHP_SUBST(APCU_CFLAGS)
+   PHP_SUBST(PHP_LDFLAGS)
+   PHP_INSTALL_HEADERS(ext/apcu, [php_apc.h apc.h apc_api.h apc_cache.h apc_globals.h apc_iterator.h apc_lock.h apc_mutex.h apc_sma.h apc_serializer.h apc_stack.h apc_arginfo.h php_apc_legacy_arginfo.h])
+   AC_DEFINE(HAVE_APCU, 1, [ ])