From eb8bfcc0a77ab7a9023d8f07ed69711b30c18009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Fri, 19 Jan 2024 13:17:07 +0100
Subject: patches/php-8.1.20_pre.local.patch: remove /usr/pkg paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/php-8.1.20_pre.local.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/patches/php-8.1.20_pre.local.patch b/patches/php-8.1.20_pre.local.patch
index cf9f8075..fde7d163 100644
--- a/patches/php-8.1.20_pre.local.patch
+++ b/patches/php-8.1.20_pre.local.patch
@@ -158,6 +158,17 @@ diff -ru php-8.1.10.orig/configure php-8.1.10/configure
        *)
          BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
        ;;
+@@ -12008,10 +12008,6 @@
+   fi
+
+
+-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+-   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+-   LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+-fi
+ test -d /usr/ucblib &&
+   if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then
+
 @@ -21314,7 +21318,7 @@
  	\$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir)
  
-- 
cgit v1.2.3