| diff -ru php-8.1.10.orig/build/libtool.m4 php-8.1.10/build/libtool.m4 |
| |
| |
| @@ -56,10 +56,6 @@ |
| # This can be used to rebuild libtool when needed |
| LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" |
| |
| -# Always use our own libtool. |
| -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| -AC_SUBST(LIBTOOL)dnl |
| - |
| # Prevent multiple expansion |
| define([AC_PROG_LIBTOOL], []) |
| ])# _AC_PROG_LIBTOOL |
| Only in php-8.1.10/build: libtool.m4.orig |
| diff -ru php-8.1.10.orig/build/Makefile.global php-8.1.10/build/Makefile.global |
| |
| |
| @@ -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 $@ |
| @@ -26,7 +26,7 @@ |
| |
| install-sapi: $(OVERALL_TARGET) |
| @echo "Installing PHP SAPI module: $(PHP_SAPI)" |
| - -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| + -@$(mkinstalldirs) $(DESTDIR)$(bindir) |
| -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \ |
| for i in 0.0.0 0.0 0; do \ |
| if test -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ |
| @@ -41,19 +41,19 @@ |
| |
| 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 \ |
| for i in `echo $(INSTALL_HEADERS)`; do \ |
| i=`$(top_srcdir)/build/shtool path -d $$i`; \ |
| - paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ |
| + paths="$$paths $(DESTDIR)$(phpincludedir)/$$i"; \ |
| done; \ |
| $(mkinstalldirs) $$paths && \ |
| - echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ |
| + echo "Installing header files: $(DESTDIR)$(phpincludedir)/" && \ |
| for i in `echo $(INSTALL_HEADERS)`; do \ |
| if test "$(PHP_PECL_EXTENSION)"; then \ |
| src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \ |
| @@ -61,12 +61,12 @@ |
| src=$$i; \ |
| fi; \ |
| if test -f "$(top_srcdir)/$$src"; then \ |
| - $(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ |
| + $(INSTALL_DATA) $(top_srcdir)/$$src $(DESTDIR)$(phpincludedir)/$$i; \ |
| elif test -f "$(top_builddir)/$$src"; then \ |
| - $(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ |
| + $(INSTALL_DATA) $(top_builddir)/$$src $(DESTDIR)$(phpincludedir)/$$i; \ |
| else \ |
| - (cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ |
| - cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ |
| + (cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(phpincludedir)/$$i; \ |
| + cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(phpincludedir)/$$i) 2>/dev/null || true; \ |
| fi \ |
| done; \ |
| fi |
| diff -ru php-8.1.10.orig/configure php-8.1.10/configure |
| |
| |
| @@ -7015,13 +7015,13 @@ |
| as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 |
| fi |
| |
| - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` |
| + APXS_LIBEXECDIR='$(DESTDIR)'`$APXS -q LIBEXECDIR` |
| if test -z `$APXS -q SYSCONFDIR`; then |
| INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| -i -n php" |
| else |
| - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` |
| + APXS_SYSCONFDIR='$(DESTDIR)'`$APXS -q SYSCONFDIR` |
| INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ |
| \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ |
| $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ |
| @@ -7775,6 +7775,9 @@ |
| *darwin*) |
| BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
| ;; |
| + *midipix*) |
| + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) \$(top_builddir)/libs/libphp.so" |
| + ;; |
| *) |
| BUILD_CLI="\$(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_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
| ;; |
| @@ -7851,12 +7854,12 @@ |
| yes|shared) |
| LIBPHP_CFLAGS="-shared" |
| PHP_EMBED_TYPE=shared |
| - INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" |
| + INSTALL_IT="\$(mkinstalldirs) \$(DESTDIR)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(DESTDIR)\$(prefix)/lib" |
| ;; |
| static) |
| LIBPHP_CFLAGS="-static" |
| PHP_EMBED_TYPE=static |
| - INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(prefix)/lib" |
| + INSTALL_IT="\$(mkinstalldirs) \$(DESTDIR)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(DESTDIR)\$(prefix)/lib" |
| ;; |
| *) |
| PHP_EMBED_TYPE=no |
| @@ -7979,7 +7982,7 @@ |
| php_sapi_module=static |
| ;; |
| esac |
| - install_sapi="install-sapi" |
| + install_sapi="" |
| |
| |
| case sapi/embed in |
| @@ -11470,14 +11473,12 @@ |
| |
| BUILD_PHPDBG="\$(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_PHPDBG_OBJS:.lo=.o) \ |
| \$(EXTRA_LIBS) \ |
| \$(PHPDBG_EXTRA_LIBS) \ |
| \$(ZEND_EXTRA_LIBS) \ |
| \$(PHP_FRAMEWORKS) \ |
| - -o \$(BUILD_BINARY)" |
| + -o \$(BUILD_BINARY) \$(top_builddir)/libs/libphp.so" |
| |
| BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ |
| \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ |
| @@ -11703,6 +11704,9 @@ |
| *darwin*) |
| BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
| ;; |
| + *midipix*) |
| + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH) \$(top_builddir)/libs/libphp.so" |
| + ;; |
| *) |
| 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)" |
| ;; |
| @@ -21314,7 +21318,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir) |
| |
| $ext_builddir/libxml.$suffix: \$(shared_objects_libxml) \$(LIBXML_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_libxml) \$(LIBXML_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_libxml) \$(LIBXML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -21691,7 +21695,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/openssl.$suffix \$(phplibdir) |
| |
| $ext_builddir/openssl.$suffix: \$(shared_objects_openssl) \$(OPENSSL_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_openssl) \$(OPENSSL_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_openssl) \$(OPENSSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -22772,7 +22776,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/pcre.$suffix \$(phplibdir) |
| |
| $ext_builddir/pcre.$suffix: \$(shared_objects_pcre) \$(PCRE_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pcre) \$(PCRE_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pcre) \$(PCRE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -24173,7 +24177,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite3.$suffix \$(phplibdir) |
| |
| $ext_builddir/sqlite3.$suffix: \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -24719,7 +24723,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/zlib.$suffix \$(phplibdir) |
| |
| $ext_builddir/zlib.$suffix: \$(shared_objects_zlib) \$(ZLIB_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zlib) \$(ZLIB_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zlib) \$(ZLIB_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -25036,7 +25040,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir) |
| |
| $ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bcmath) \$(BCMATH_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bcmath) \$(BCMATH_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -25673,7 +25677,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir) |
| |
| $ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bz2) \$(BZ2_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bz2) \$(BZ2_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -25985,7 +25989,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir) |
| |
| $ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_calendar) \$(CALENDAR_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_calendar) \$(CALENDAR_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -26294,7 +26298,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir) |
| |
| $ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ctype) \$(CTYPE_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ctype) \$(CTYPE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -27344,7 +27348,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/curl.$suffix \$(phplibdir) |
| |
| $ext_builddir/curl.$suffix: \$(shared_objects_curl) \$(CURL_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_curl) \$(CURL_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_curl) \$(CURL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -31697,7 +31701,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir) |
| |
| $ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dba) \$(DBA_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dba) \$(DBA_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -32594,7 +32598,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/dom.$suffix \$(phplibdir) |
| |
| $ext_builddir/dom.$suffix: \$(shared_objects_dom) \$(DOM_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dom) \$(DOM_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dom) \$(DOM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -34057,7 +34061,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/exif.$suffix \$(phplibdir) |
| |
| $ext_builddir/exif.$suffix: \$(shared_objects_exif) \$(EXIF_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_exif) \$(EXIF_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_exif) \$(EXIF_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -35243,7 +35247,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/fileinfo.$suffix \$(phplibdir) |
| |
| $ext_builddir/fileinfo.$suffix: \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8 |
| |
| EOF |
| |
| @@ -35575,7 +35579,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/filter.$suffix \$(phplibdir) |
| |
| $ext_builddir/filter.$suffix: \$(shared_objects_filter) \$(FILTER_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_filter) \$(FILTER_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_filter) \$(FILTER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8 |
| |
| EOF |
| |
| @@ -35950,7 +35954,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/ftp.$suffix \$(phplibdir) |
| |
| $ext_builddir/ftp.$suffix: \$(shared_objects_ftp) \$(FTP_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ftp) \$(FTP_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ftp) \$(FTP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -41144,7 +41148,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/gettext.$suffix \$(phplibdir) |
| |
| $ext_builddir/gettext.$suffix: \$(shared_objects_gettext) \$(GETTEXT_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_gettext) \$(GETTEXT_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_gettext) \$(GETTEXT_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -43812,7 +43816,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/iconv.$suffix \$(phplibdir) |
| |
| $ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-liconv |
| |
| EOF |
| |
| @@ -50165,7 +50169,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir) |
| |
| $ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mbstring) \$(MBSTRING_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mbstring) \$(MBSTRING_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8 |
| |
| EOF |
| |
| @@ -55345,7 +55349,16 @@ |
| printf %s "checking for sysvipc shared memory support... " >&6; } |
| if test "$cross_compiling" = yes |
| then : |
| - have_shm_ipc=no |
| + |
| + case $host_alias in |
| + *midipix*) |
| + have_shm_ipc=yes |
| + ;; |
| + *) |
| + have_shm_ipc=no |
| + ;; |
| + esac |
| + |
| else $as_nop |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| /* end confdefs.h. */ |
| @@ -56221,7 +56234,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/opcache.$suffix \$(phplibdir) |
| |
| $ext_builddir/opcache.$suffix: \$(shared_objects_opcache) \$(OPCACHE_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_opcache) \$(OPCACHE_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_opcache) \$(OPCACHE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8 |
| |
| EOF |
| |
| @@ -65467,7 +65480,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir) |
| |
| $ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_posix) \$(POSIX_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_posix) \$(POSIX_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -69010,7 +69023,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir) |
| |
| $ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_readline) \$(READLINE_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_readline) \$(READLINE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -69839,7 +69852,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir) |
| |
| $ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_session) \$(SESSION_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_session) \$(SESSION_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -70376,7 +70389,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir) |
| |
| $ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_shmop) \$(SHMOP_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_shmop) \$(SHMOP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -70928,7 +70941,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir) |
| |
| $ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -72718,7 +72731,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir) |
| |
| $ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_soap) \$(SOAP_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_soap) \$(SOAP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -73309,7 +73322,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir) |
| |
| $ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sockets) \$(SOCKETS_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sockets) \$(SOCKETS_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -79177,7 +79190,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir) |
| |
| $ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -79483,7 +79496,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir) |
| |
| $ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -79840,7 +79853,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir) |
| |
| $ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -81122,7 +81135,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir) |
| |
| $ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -81966,7 +81979,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir) |
| |
| $ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xml) \$(XML_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xml) \$(XML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -82542,7 +82555,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir) |
| |
| $ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -83118,7 +83131,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir) |
| |
| $ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -83889,7 +83902,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir) |
| |
| $ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -84217,7 +84230,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/zend_test.$suffix \$(phplibdir) |
| |
| $ext_builddir/zend_test.$suffix: \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so |
| |
| EOF |
| |
| @@ -85749,7 +85762,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir) |
| |
| $ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zip) \$(ZIP_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zip) \$(ZIP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8 |
| |
| EOF |
| |
| @@ -86585,7 +86598,7 @@ |
| \$(LIBTOOL) --mode=install cp $ext_builddir/mysqlnd.$suffix \$(phplibdir) |
| |
| $ext_builddir/mysqlnd.$suffix: \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_DEPENDENCIES) |
| - \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_LIBADD) |
| + \$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lcrypto \-lz |
| |
| EOF |
| |
| @@ -86818,7 +86831,7 @@ |
| enable_static=yes |
| |
| case $php_sapi_module in |
| - shared) |
| + *) |
| if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then |
| enable_static=no |
| fi |
| @@ -86832,12 +86845,6 @@ |
| esac |
| EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" |
| ;; |
| - *) |
| - standard_libtool_flag='-prefer-non-pic -static' |
| - if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then |
| - enable_shared=no |
| - fi |
| - ;; |
| esac |
| |
| EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" |
| @@ -87006,6 +87013,8 @@ |
| fiber_os="mac" ;; #( |
| aix*|os400*) : |
| fiber_os="aix" ;; #( |
| + midipix*) : |
| + fiber_os="midipix" ;; #( |
| *) : |
| fiber_os="other" |
| ;; |
| @@ -87039,6 +87048,8 @@ |
| |
| if test "$fiber_os" = 'mac'; then |
| fiber_asm_file="combined_sysv_macho_gas" |
| +elif test "$fiber_os" = 'midipix'; then |
| + fiber_asm_file="x86_64_ms_pe_gas" |
| elif test "$fiber_os" = 'aix'; then |
| # AIX uses a different calling convention (shared with non-_CALL_ELF Linux). |
| # The AIX assembler isn't GNU, but the file is compatible. |
| @@ -87113,8 +87124,14 @@ |
| if test "x$ac_cv_header_ucontext_h" = xyes |
| then : |
| |
| - |
| -printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h |
| + case $host_alias in |
| + *midipix*) |
| + # not supported |
| + ;; |
| + *) |
| + printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h |
| + ;; |
| + esac |
| |
| |
| else $as_nop |
| @@ -91081,7 +91098,7 @@ |
| lt_prog_compiler_static='-Bstatic' |
| ;; |
| |
| - linux* | k*bsd*-gnu) |
| + linux* | k*bsd*-gnu | midipix*) |
| case $cc_basename in |
| # old Intel for x86_64 which still supported -KPIC. |
| ecc*) |
| @@ -92801,6 +92818,17 @@ |
| dynamic_linker='GNU/Linux ld.so' |
| ;; |
| |
| +midipix*) |
| + version_type=linux # correct to gnu/linux during the next big refactor |
| + need_lib_prefix=no |
| + need_version=no |
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
| + soname_spec='$libname$release$shared_ext$major' |
| + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
| + shlibpath_var=LD_LIBRARY_PATH |
| + dynamic_linker='GNU/Linux ld.so' |
| + ;; |
| + |
| netbsd*) |
| version_type=sunos |
| need_lib_prefix=no |
| @@ -94872,7 +94900,7 @@ |
| hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
| hardcode_libdir_separator_CXX=: |
| ;; |
| - linux* | k*bsd*-gnu) |
| + linux* | k*bsd*-gnu | midipix*) |
| case $cc_basename in |
| KCC*) |
| # Kuck and Associates, Inc. (KAI) C++ Compiler |
| diff -ru php-8.1.10.orig/ext/pdo/Makefile.frag php-8.1.10/ext/pdo/Makefile.frag |
| |
| |
| @@ -15,17 +15,17 @@ |
| fi) |
| |
| install-pdo-headers: |
| - @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo |
| + @echo "Installing PDO headers: $(DESTDIR)$(phpincludedir)/ext/pdo/" |
| + @$(mkinstalldirs) $(DESTDIR)$(phpincludedir)/ext/pdo |
| @for f in $(PDO_HEADER_FILES); do \ |
| if test -f "$(top_srcdir)/$$f"; then \ |
| - $(INSTALL_DATA) $(top_srcdir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ |
| + $(INSTALL_DATA) $(top_srcdir)/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ |
| elif test -f "$(top_builddir)/$$f"; then \ |
| - $(INSTALL_DATA) $(top_builddir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ |
| + $(INSTALL_DATA) $(top_builddir)/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ |
| elif test -f "$(top_srcdir)/ext/pdo/$$f"; then \ |
| - $(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ |
| + $(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ |
| elif test -f "$(top_builddir)/ext/pdo/$$f"; then \ |
| - $(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ |
| + $(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ |
| else \ |
| echo "hmmm"; \ |
| fi \ |
| diff -ru php-8.1.10.orig/ext/phar/Makefile.frag php-8.1.10/ext/phar/Makefile.frag |
| |
| |
| @@ -23,7 +23,7 @@ |
| else \ |
| $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
| fi;` |
| -PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| +PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| |
| $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |
| -@test -d $(builddir)/phar || mkdir $(builddir)/phar |
| @@ -41,10 +41,10 @@ |
| -@chmod +x $(builddir)/phar.phar |
| |
| install-pharcmd: pharcmd |
| - -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| - $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar |
| - -@rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix) |
| - $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix) |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 |
| - @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1 |
| - @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1 |
| + -@$(mkinstalldirs) $(DESTDIR)$(bindir) |
| + $(INSTALL) $(builddir)/phar.phar $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix).phar |
| + -@rm -f $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix) |
| + $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix) |
| + @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 |
| + @$(INSTALL_DATA) $(builddir)/phar.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1 |
| + @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1 |
| diff -ru php-8.1.10.orig/pear/Makefile.frag php-8.1.10/pear/Makefile.frag |
| |
| |
| @@ -13,7 +13,7 @@ |
| @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} |
| |
| install-pear: |
| - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" |
| + @echo "Installing PEAR environment: $(DESTDIR)$(peardir)/" |
| @if test ! -f $(builddir)/install-pear-nozlib.phar; then \ |
| if test -f $(srcdir)/install-pear-nozlib.phar; then \ |
| cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ |
| @@ -27,7 +27,7 @@ |
| fi \ |
| fi \ |
| fi |
| - @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ |
| + @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(DESTDIR)$(peardir); then \ |
| $(MAKE) -s install-pear-installer; \ |
| else \ |
| cat $(srcdir)/install-pear.txt; \ |
| diff -ru php-8.1.10.orig/sapi/cgi/Makefile.frag php-8.1.10/sapi/cgi/Makefile.frag |
| |
| |
| @@ -4,9 +4,9 @@ |
| $(BUILD_CGI) |
| |
| install-cgi: $(SAPI_CGI_PATH) |
| - @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| - @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) |
| - @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 |
| + @echo "Installing PHP CGI binary: $(DESTDIR)$(bindir)/" |
| + @$(mkinstalldirs) $(DESTDIR)$(bindir) |
| + @$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) |
| + @echo "Installing PHP CGI man page: $(DESTDIR)$(mandir)/man1/" |
| + @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 |
| + @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 |
| diff -ru php-8.1.10.orig/sapi/cli/Makefile.frag php-8.1.10/sapi/cli/Makefile.frag |
| |
| |
| @@ -4,9 +4,9 @@ |
| $(BUILD_CLI) |
| |
| install-cli: $(SAPI_CLI_PATH) |
| - @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| - @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) |
| - @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 |
| - @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 |
| + @echo "Installing PHP CLI binary: $(DESTDIR)$(bindir)/" |
| + @$(mkinstalldirs) $(DESTDIR)$(bindir) |
| + @$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) |
| + @echo "Installing PHP CLI man page: $(DESTDIR)$(mandir)/man1/" |
| + @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 |
| + @$(INSTALL_DATA) sapi/cli/php.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 |
| diff -ru php-8.1.10.orig/sapi/fpm/Makefile.frag php-8.1.10/sapi/fpm/Makefile.frag |
| |
| |
| @@ -4,25 +4,25 @@ |
| $(BUILD_FPM) |
| |
| install-fpm: $(SAPI_FPM_PATH) |
| - @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run |
| - @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) |
| + @echo "Installing PHP FPM binary: $(DESTDIR)$(sbindir)/" |
| + @$(mkinstalldirs) $(DESTDIR)$(sbindir) |
| + @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log |
| + @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run |
| + @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(DESTDIR)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) |
| |
| - @if test -f "$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf"; then \ |
| + @if test -f "$(DESTDIR)$(sysconfdir)/php-fpm.conf"; then \ |
| echo "Installing PHP FPM defconfig: skipping"; \ |
| else \ |
| - echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ |
| - $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ |
| - $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ |
| - $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ |
| + echo "Installing PHP FPM defconfig: $(DESTDIR)$(sysconfdir)/" && \ |
| + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/php-fpm.d; \ |
| + $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(DESTDIR)$(sysconfdir)/php-fpm.conf.default; \ |
| + $(INSTALL_DATA) sapi/fpm/www.conf $(DESTDIR)$(sysconfdir)/php-fpm.d/www.conf.default; \ |
| fi |
| |
| - @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 |
| - @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 |
| + @echo "Installing PHP FPM man page: $(DESTDIR)$(mandir)/man8/" |
| + @$(mkinstalldirs) $(DESTDIR)$(mandir)/man8 |
| + @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(DESTDIR)$(mandir)/man8/php-fpm$(program_suffix).8 |
| |
| - @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm |
| - @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html |
| + @echo "Installing PHP FPM status page: $(DESTDIR)$(datadir)/fpm/" |
| + @$(mkinstalldirs) $(DESTDIR)$(datadir)/fpm |
| + @$(INSTALL_DATA) sapi/fpm/status.html $(DESTDIR)$(datadir)/fpm/status.html |
| diff -ru php-8.1.10.orig/sapi/litespeed/Makefile.frag php-8.1.10/sapi/litespeed/Makefile.frag |
| |
| |
| @@ -4,6 +4,6 @@ |
| $(BUILD_LITESPEED) |
| |
| install-litespeed: $(SAPI_LITESPEED_PATH) |
| - @echo "Installing PHP LiteSpeed binary: $(INSTALL_ROOT)$(bindir)/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| - @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)lsphp$(program_suffix) |
| + @echo "Installing PHP LiteSpeed binary: $(DESTDIR)$(bindir)/" |
| + @$(mkinstalldirs) $(DESTDIR)$(bindir) |
| + @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(DESTDIR)$(bindir)/$(program_prefix)lsphp$(program_suffix) |
| diff -ru php-8.1.10.orig/sapi/phpdbg/Makefile.frag php-8.1.10/sapi/phpdbg/Makefile.frag |
| |
| |
| @@ -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) |
| - @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 -ru php-8.1.10.orig/scripts/Makefile.frag php-8.1.10/scripts/Makefile.frag |
| |
| |
| @@ -27,24 +27,24 @@ |
| man_PAGES = phpize php-config |
| |
| install-build: |
| - @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \ |
| + @echo "Installing build environment: $(DESTDIR)$(phpbuilddir)/" |
| + @$(mkinstalldirs) $(DESTDIR)$(phpbuilddir) $(DESTDIR)$(bindir) && \ |
| (cd $(top_srcdir) && \ |
| - $(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \ |
| - $(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir)) |
| + $(INSTALL) $(BUILD_FILES_EXEC) $(DESTDIR)$(phpbuilddir) && \ |
| + $(INSTALL_DATA) $(BUILD_FILES) $(DESTDIR)$(phpbuilddir)) |
| |
| install-programs: $(builddir)/phpize $(builddir)/php-config |
| - @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| + @echo "Installing helper programs: $(DESTDIR)$(bindir)/" |
| + @$(mkinstalldirs) $(DESTDIR)$(bindir) |
| @for prog in $(bin_SCRIPTS); do \ |
| echo " program: $(program_prefix)$${prog}$(program_suffix)"; \ |
| - $(INSTALL) -m 755 $(builddir)/$${prog} $(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \ |
| + $(INSTALL) -m 755 $(builddir)/$${prog} $(DESTDIR)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \ |
| done |
| - @echo "Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/" |
| - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 |
| + @echo "Installing man pages: $(DESTDIR)$(mandir)/man1/" |
| + @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 |
| @for page in $(man_PAGES); do \ |
| echo " page: $(program_prefix)$${page}$(program_suffix).1"; \ |
| - $(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \ |
| + $(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \ |
| done |
| |
| $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status |
| diff -ru php-8.1.10.orig/TSRM/TSRM.h php-8.1.10/TSRM/TSRM.h |
| |
| |
| @@ -147,7 +147,7 @@ |
| # define __has_attribute(x) 0 |
| #endif |
| |
| -#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) |
| +#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) || defined(__midipix__) |
| # define TSRM_TLS_MODEL_ATTR |
| #elif __PIC__ |
| # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec"))) |
| Only in php-8.1.10/TSRM: TSRM.h.orig |