diff options
Diffstat (limited to 'data/php/all.diff')
| -rw-r--r-- | data/php/all.diff | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/data/php/all.diff b/data/php/all.diff new file mode 100644 index 000000000..b5851b40b --- /dev/null +++ b/data/php/all.diff @@ -0,0 +1,43 @@ +diff -ur php-7.3.4/ext/phar/Makefile.frag php-7.3.4+iPhone/ext/phar/Makefile.frag +--- php-7.3.4/ext/phar/Makefile.frag 2019-04-02 13:48:53.000000000 +0000 ++++ php-7.3.4+iPhone/ext/phar/Makefile.frag 2019-04-30 18:56:02.627135807 +0000 +@@ -31,13 +31,13 @@ + + $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) + -@echo "Generating phar.php" +- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php ++ @php $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php + + $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) + -@echo "Generating phar.phar" + -@rm -f $(builddir)/phar.phar + -@rm -f $(srcdir)/phar.phar +- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/ ++ @php $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/ + -@chmod +x $(builddir)/phar.phar + + install-pharcmd: pharcmd +diff -ur php-7.3.4/main/php.h php-7.3.4+iPhone/main/php.h +--- php-7.3.4/main/php.h 2019-04-02 13:48:51.000000000 +0000 ++++ php-7.3.4+iPhone/main/php.h 2019-04-30 18:51:45.927014989 +0000 +@@ -479,7 +479,7 @@ + */ + + #ifndef XtOffset +-#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__))) ++#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__) || defined(__APPLE__))) + #ifdef __STDC__ + #define XtOffset(p_type, field) _Offsetof(p_type, field) + #else +diff -ur php-7.3.4/pear/Makefile.frag php-7.3.4+iPhone/pear/Makefile.frag +--- php-7.3.4/pear/Makefile.frag 2019-04-02 13:48:51.000000000 +0000 ++++ php-7.3.4+iPhone/pear/Makefile.frag 2019-04-30 18:56:15.431142281 +0000 +@@ -12,7 +12,7 @@ + PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @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)/" |