Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix cross-compilation check in phar generation for FreeBSD

Author: nielsdos

NEWS

@@ -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)

ext/phar/Makefile.frag

@@ -35,15 +35,15 @@ 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"; \
 	fi)
 
 $(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); \