php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix cross-compilation check in phar generation for FreeBSD
This commit is contained in:
nielsdos
2023-06-13 19:13:34 +02:00
parent c160693515 4fcb3e0d34
commit a9c6b840ad
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -50,6 +50,9 @@ PHP NEWS
- PCRE:
. Fix preg_replace_callback_array() pattern validation. (ilutov)
- Phar:
. Fix cross-compilation check in phar generation for FreeBSD. (peter279k)
- SPL:
. Fixed bug GH-11338 (SplFileInfo empty getBasename with more than one
slash). (nielsdos)

6
ext/phar/Makefile.frag
View File

@@ -35,7 +35,7 @@ TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-@(echo "Generating phar.php"; \
if [ $(TEST_PHP_EXECUTABLE_RES) -ne 1 ]; then \
if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php; \
else \
echo "Skipping phar.php generating during cross compilation"; \
@@ -43,7 +43,7 @@ $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcd
$(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-@(echo "Generating phar.phar"; \
if [ $(TEST_PHP_EXECUTABLE_RES) -ne 1 ]; then \
if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
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/; \
@@ -53,7 +53,7 @@ $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/
fi)
install-pharcmd: pharcmd
@(if [ $(TEST_PHP_EXECUTABLE_RES) -ne 1 ]; then \
@(if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
$(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); \