From 53550805f93fcb3de3f1ad9192529b275df25279 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 7 Jul 2025 22:59:25 +0700 Subject: [PATCH 1/5] add "nosys" tag to not pull in system include locations --- frankenphp.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frankenphp.go b/frankenphp.go index 6888cad129..5ce9c76520 100644 --- a/frankenphp.go +++ b/frankenphp.go @@ -14,14 +14,16 @@ package frankenphp // #cgo nocallback frankenphp_update_server_context // #cgo noescape frankenphp_update_server_context -// #cgo darwin pkg-config: libxml-2.0 +// #cgo !nosys darwin pkg-config: libxml-2.0 // #cgo CFLAGS: -Wall -Werror -// #cgo CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib +// #cgo !nosys CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib // #cgo linux CFLAGS: -D_GNU_SOURCE -// #cgo darwin CFLAGS: -I/opt/homebrew/include -// #cgo LDFLAGS: -L/usr/local/lib -L/usr/lib -lphp -lm -lutil +// #cgo !nosys darwin CFLAGS: -I/opt/homebrew/include +// #cgo !nosys LDFLAGS: -L/usr/local/lib -L/usr/lib +// #cgo LDFLAGS: -lphp -lm -lutil // #cgo linux LDFLAGS: -ldl -lresolv -// #cgo darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib -liconv -ldl +// #cgo !nosys darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib +// #cgo darwin LDFLAGS: -liconv -ldl // #include // #include // #include From a7ff2a0fd933b8fd07098de680bdeec98add1bb7 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Tue, 8 Jul 2025 12:46:16 +0700 Subject: [PATCH 2/5] rename to "nosysinc" --- frankenphp.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frankenphp.go b/frankenphp.go index 5ce9c76520..d929fe0512 100644 --- a/frankenphp.go +++ b/frankenphp.go @@ -14,15 +14,15 @@ package frankenphp // #cgo nocallback frankenphp_update_server_context // #cgo noescape frankenphp_update_server_context -// #cgo !nosys darwin pkg-config: libxml-2.0 +// #cgo !nosysinc darwin pkg-config: libxml-2.0 // #cgo CFLAGS: -Wall -Werror -// #cgo !nosys CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib +// #cgo !nosysinc CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib // #cgo linux CFLAGS: -D_GNU_SOURCE -// #cgo !nosys darwin CFLAGS: -I/opt/homebrew/include -// #cgo !nosys LDFLAGS: -L/usr/local/lib -L/usr/lib +// #cgo !nosysinc darwin CFLAGS: -I/opt/homebrew/include +// #cgo !nosysinc LDFLAGS: -L/usr/local/lib -L/usr/lib // #cgo LDFLAGS: -lphp -lm -lutil // #cgo linux LDFLAGS: -ldl -lresolv -// #cgo !nosys darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib +// #cgo !nosysinc darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib // #cgo darwin LDFLAGS: -liconv -ldl // #include // #include From 425250a3a61e25742be429d7c717d7ad0148db8e Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Tue, 8 Jul 2025 13:13:16 +0700 Subject: [PATCH 3/5] Revert "rename to "nosysinc"" This reverts commit a7ff2a0fd933b8fd07098de680bdeec98add1bb7. --- frankenphp.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frankenphp.go b/frankenphp.go index d929fe0512..5ce9c76520 100644 --- a/frankenphp.go +++ b/frankenphp.go @@ -14,15 +14,15 @@ package frankenphp // #cgo nocallback frankenphp_update_server_context // #cgo noescape frankenphp_update_server_context -// #cgo !nosysinc darwin pkg-config: libxml-2.0 +// #cgo !nosys darwin pkg-config: libxml-2.0 // #cgo CFLAGS: -Wall -Werror -// #cgo !nosysinc CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib +// #cgo !nosys CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib // #cgo linux CFLAGS: -D_GNU_SOURCE -// #cgo !nosysinc darwin CFLAGS: -I/opt/homebrew/include -// #cgo !nosysinc LDFLAGS: -L/usr/local/lib -L/usr/lib +// #cgo !nosys darwin CFLAGS: -I/opt/homebrew/include +// #cgo !nosys LDFLAGS: -L/usr/local/lib -L/usr/lib // #cgo LDFLAGS: -lphp -lm -lutil // #cgo linux LDFLAGS: -ldl -lresolv -// #cgo !nosysinc darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib +// #cgo !nosys darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib // #cgo darwin LDFLAGS: -liconv -ldl // #include // #include From 13e90956728e979e105b1ddf352ef0ef48c806eb Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Wed, 9 Jul 2025 17:16:23 +0700 Subject: [PATCH 4/5] remove paths all together --- frankenphp.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frankenphp.go b/frankenphp.go index 5ce9c76520..5bfc47b5a8 100644 --- a/frankenphp.go +++ b/frankenphp.go @@ -14,15 +14,11 @@ package frankenphp // #cgo nocallback frankenphp_update_server_context // #cgo noescape frankenphp_update_server_context -// #cgo !nosys darwin pkg-config: libxml-2.0 +// #cgo darwin pkg-config: libxml-2.0 // #cgo CFLAGS: -Wall -Werror -// #cgo !nosys CFLAGS: -I/usr/local/include -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib // #cgo linux CFLAGS: -D_GNU_SOURCE -// #cgo !nosys darwin CFLAGS: -I/opt/homebrew/include -// #cgo !nosys LDFLAGS: -L/usr/local/lib -L/usr/lib // #cgo LDFLAGS: -lphp -lm -lutil // #cgo linux LDFLAGS: -ldl -lresolv -// #cgo !nosys darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libiconv/lib // #cgo darwin LDFLAGS: -liconv -ldl // #include // #include From 0309228ab8b7b1d45a54d52ace1136fe9297b0af Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 16 Jul 2025 17:18:44 +0700 Subject: [PATCH 5/5] bring back rpath for macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Kévin Dunglas --- frankenphp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frankenphp.go b/frankenphp.go index 5bfc47b5a8..684da080bc 100644 --- a/frankenphp.go +++ b/frankenphp.go @@ -19,7 +19,7 @@ package frankenphp // #cgo linux CFLAGS: -D_GNU_SOURCE // #cgo LDFLAGS: -lphp -lm -lutil // #cgo linux LDFLAGS: -ldl -lresolv -// #cgo darwin LDFLAGS: -liconv -ldl +// #cgo darwin LDFLAGS: -Wl,-rpath,/usr/local/lib -liconv -ldl // #include // #include // #include