diff options
| author | Ørjan Malde <red@foxi.me> | 2022-10-18 01:33:32 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2022-10-18 01:33:32 +0200 |
| commit | d1bf7fe0031301a14aab0b1c0f68fc53067603db (patch) | |
| tree | 0c194f7044e7a890aac951986f3dd9ceda3cf4b5 /patches | |
| parent | 495cf31eed6aa06c750a1571c391a6ca04591cf7 (diff) | |
| download | midipix_build-d1bf7fe0031301a14aab0b1c0f68fc53067603db.tar.bz2 midipix_build-d1bf7fe0031301a14aab0b1c0f68fc53067603db.tar.xz | |
patches/php-8.1.10_pre.local.patch: use DESTDIR for shared module installation
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/php-8.1.10_pre.local.patch | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/patches/php-8.1.10_pre.local.patch b/patches/php-8.1.10_pre.local.patch index b3bb7dc5..81e7d182 100644 --- a/patches/php-8.1.10_pre.local.patch +++ b/patches/php-8.1.10_pre.local.patch @@ -1,3 +1,32 @@ +diff -ru php-8.1.10.orig/build/Makefile.global php-8.1.10/build/Makefile.global +--- php-8.1.10.orig/build/Makefile.global 2022-10-18 01:06:50.776890570 +0200 ++++ php-8.1.10/build/Makefile.global 2022-10-18 01:07:22.908889564 +0200 +@@ -11,9 +11,9 @@ + @echo "Don't forget to run 'make test'." + @echo + +-build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) ++build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la + +-build-binaries: $(PHP_BINARIES) ++build-binaries: $(PHP_BINARIES) libphp.la + + libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +@@ -41,10 +41,10 @@ + + install-modules: build-modules + @test -d modules && \ +- $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) +- @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" ++ $(mkinstalldirs) $(DESTDIR)$(EXTENSION_DIR) ++ @echo "Installing shared extensions: $(DESTDIR)$(EXTENSION_DIR)/" + @rm -f modules/*.la >/dev/null 2>&1 +- @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) ++ @$(INSTALL) modules/* $(DESTDIR)$(EXTENSION_DIR) + + install-headers: + -@if test "$(INSTALL_HEADERS)"; then \ diff -Nru php-8.1.0.orig/build/libtool.m4 php-8.1.0/build/libtool.m4 --- php-8.1.0.orig/build/libtool.m4 2021-11-23 19:56:11.000000000 +0100 +++ php-8.1.0/build/libtool.m4 2021-11-26 11:59:47.795396689 +0100 @@ -12,21 +41,6 @@ diff -Nru php-8.1.0.orig/build/libtool.m4 php-8.1.0/build/libtool.m4 # Prevent multiple expansion define([AC_PROG_LIBTOOL], []) ])# _AC_PROG_LIBTOOL -diff -Nru php-8.1.0.orig/build/Makefile.global php-8.1.0/build/Makefile.global ---- php-8.1.0.orig/build/Makefile.global 2021-11-23 19:56:11.000000000 +0100 -+++ php-8.1.0/build/Makefile.global 2021-11-26 11:59:25.139396233 +0100 -@@ -11,9 +11,9 @@ - @echo "Don't forget to run 'make test'." - @echo - --build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) -+build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la - --build-binaries: $(PHP_BINARIES) -+build-binaries: $(PHP_BINARIES) libphp.la - - libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure --- php-8.1.0.orig/configure 2021-11-23 19:56:11.000000000 +0100 +++ php-8.1.0/configure 2021-11-28 11:23:38.328485103 +0100 |