Skip to content

Commit fa75a88

Browse files
committed
Quick fix for resolving issue #11099
1 parent 6408fb2 commit fa75a88

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

ext/phar/Makefile.frag

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,30 @@ $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
2929
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
3030
-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
3131

32+
33+
TEST_PHP_EXECUTABLE = $(shell $(PHP_EXECUTABLE) -v 2>&1)
34+
TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -o 'Exec format error')
35+
3236
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
33-
-@echo "Generating phar.php"
34-
@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php
37+
-@(echo "Generating phar.php"; \
38+
if [[ "$(TEST_PHP_EXECUTABLE_RES)" != 'Exec format error' ]]; then \
39+
$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php; \
40+
fi)
3541

3642
$(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
37-
-@echo "Generating phar.phar"
38-
-@rm -f $(builddir)/phar.phar
39-
-@rm -f $(srcdir)/phar.phar
40-
@$(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/
41-
-@chmod +x $(builddir)/phar.phar
43+
-@(echo "Generating phar.phar"; \
44+
if [[ "$(TEST_PHP_EXECUTABLE_RES)" != 'Exec format error' ]]; then \
45+
rm -f $(builddir)/phar.phar; \
46+
rm -f $(srcdir)/phar.phar; \
47+
$(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/; \
48+
chmod +x $(builddir)/phar.phar; \
49+
fi)
4250

4351
install-pharcmd: pharcmd
44-
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
45-
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar
46-
-@rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix)
47-
$(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix)
48-
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
49-
@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1
50-
@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1
52+
@(if [[ "$(TEST_PHP_EXECUTABLE_RES)" != 'Exec format error' ]]; then \
53+
$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar; \
54+
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); \
55+
$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1; \
56+
$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1; \
57+
$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1; \
58+
fi)

0 commit comments

Comments
 (0)