Skip to content

Commit 4fcb3e0

Browse files
peter279knielsdos
authored andcommitted
Fix cross-compilation check in phar generation for FreeBSD
FreeBSD's shell is very POSIX strict. This patch makes sure it works correctly under FreeBSD too. Closes phpGH-11441.
1 parent a8a3b99 commit 4fcb3e0

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ PHP NEWS
4747
. Fixed bug GH-9356 Incomplete validation of IPv6 Address fields in
4848
subjectAltNames (James Lucas, Jakub Zelenka).
4949

50+
- Phar:
51+
. Fix cross-compilation check in phar generation for FreeBSD. (peter279k)
52+
5053
- SPL:
5154
. Fixed bug GH-11338 (SplFileInfo empty getBasename with more than one
5255
slash). (nielsdos)

ext/phar/Makefile.frag

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec
3535

3636
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
3737
-@(echo "Generating phar.php"; \
38-
if [ $(TEST_PHP_EXECUTABLE_RES) -ne 1 ]; then \
38+
if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
3939
$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php; \
4040
else \
4141
echo "Skipping phar.php generating during cross compilation"; \
4242
fi)
4343

4444
$(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
4545
-@(echo "Generating phar.phar"; \
46-
if [ $(TEST_PHP_EXECUTABLE_RES) -ne 1 ]; then \
46+
if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
4747
rm -f $(builddir)/phar.phar; \
4848
rm -f $(srcdir)/phar.phar; \
4949
$(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)/
5353
fi)
5454

5555
install-pharcmd: pharcmd
56-
@(if [ $(TEST_PHP_EXECUTABLE_RES) -ne 1 ]; then \
56+
@(if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
5757
$(mkinstalldirs) $(INSTALL_ROOT)$(bindir); \
5858
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar; \
5959
rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix); \

0 commit comments

Comments
 (0)