summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2022-12-27 12:09:18 +0100
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2022-12-27 12:09:18 +0100
commit3811f1883c09fd59802d2a6567b888989ecb8b5d (patch)
tree274ef0ccfa8ceb18b304751567bfaac810d76400
parent4cbdf999089f893902ed49229719e0d79fd99754 (diff)
downloadmidipix_build-3811f1883c09fd59802d2a6567b888989ecb8b5d.tar.bz2
midipix_build-3811f1883c09fd59802d2a6567b888989ecb8b5d.tar.xz
patches/php-8.1.10_pre.local.patch: use DESTDIR for phpdbg installation
-rw-r--r--patches/php-8.1.10_pre.local.patch32
1 files changed, 21 insertions, 11 deletions
diff --git a/patches/php-8.1.10_pre.local.patch b/patches/php-8.1.10_pre.local.patch
index cdb0b426..4c974283 100644
--- a/patches/php-8.1.10_pre.local.patch
+++ b/patches/php-8.1.10_pre.local.patch
@@ -573,18 +573,28 @@ diff -Nru php-8.1.0.orig/sapi/cgi/Makefile.frag php-8.1.0/sapi/cgi/Makefile.frag
@echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
-diff -Nru php-8.1.0.orig/sapi/phpdbg/Makefile.frag php-8.1.0/sapi/phpdbg/Makefile.frag
---- php-8.1.0.orig/sapi/phpdbg/Makefile.frag 2021-11-23 19:56:11.000000000 +0100
-+++ php-8.1.0/sapi/phpdbg/Makefile.frag 2021-11-26 12:01:32.975398802 +0100
-@@ -25,7 +25,7 @@
- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
- @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
+--- php-8.1.0/sapi/phpdbg/Makefile.frag.orig 2022-08-30 18:09:36.000000000 +0200
++++ php-8.1.0/sapi/phpdbg/Makefile.frag 2022-12-27 12:07:50.745278819 +0100
+@@ -21,11 +21,11 @@
+ @$(YACC) $(YFLAGS) -v -d $(srcdir)/phpdbg_parser.y -o $@
+
+ install-phpdbg: $(BUILD_BINARY)
+- @echo "Installing phpdbg binary: $(INSTALL_ROOT)$(bindir)/"
+- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+- @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
+- @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
- @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
-+ @$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
- @echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/"
- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
+- @echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/"
+- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+- @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
++ @echo "Installing phpdbg binary: $(DESTDIR)$(bindir)/"
++ @$(mkinstalldirs) $(DESTDIR)$(bindir)
++ @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
++ @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
++ @$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(DESTDIR)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++ @echo "Installing phpdbg man page: $(DESTDIR)$(mandir)/man1/"
++ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
++ @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
diff -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h
--- php-8.1.0.orig/TSRM/TSRM.h 2021-11-23 19:56:11.000000000 +0100
+++ php-8.1.0/TSRM/TSRM.h 2021-11-26 12:02:01.263399370 +0100