php < 7.4: Fix validation of PKG_CONFIG var #90249

Ericson2314 · 2020-06-13T19:07:37Z

Motivation for this change

They were assuming it is an absolute path, but it (conventionally) can
be something to look up on the PATH too.

Things done

They were assuming it is an absolute path, but it (conventionally) can be something to look up on the PATH too. Fixes NixOS#90202

Izorkin · 2020-06-14T04:47:27Z

@GrahamcOfBorg build php72 php73 php74

Izorkin · 2020-06-14T07:19:09Z

Need add this path to pkgs/top-level/php-packages.nix ?

In the build log lot of warning mesages:

...
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './Zend/acinclude.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './Zend/Zend.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/libxml/config0.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/dba/config.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/xml/config.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/tidy/config.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/date/config0.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/json/config.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/pdo_sqlite/config.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/xmlrpc/libxmlrpc/acinclude.m4'
substituteStream(): WARNING: pattern 'test -x "$PKG_CONFIG"' doesn't match anything in file './ext/xmlrpc/libxmlrpc/xmlrpc.m4'
...

It is possible to replace this patch? -

diff --git a/acinclude.m4 b/acinclude.m4
index 0690ec7d..3eb8b7c9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2208,7 +2208,7 @@ AC_DEFUN([PHP_SETUP_ICU],[
   fi

   dnl If pkg-config is found try using it
-  if test "$PHP_ICU_DIR" = "DEFAULT" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then
+  if test "$PHP_ICU_DIR" = "DEFAULT" && type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then
     if $PKG_CONFIG --atleast-version=4.0 icu-uc; then
       found_icu=yes
       icu_version_full=`$PKG_CONFIG --modversion icu-uc`
@@ -2361,7 +2361,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
   fi

   dnl If pkg-config is found try using it
-  if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+  if test "$PHP_OPENSSL_DIR" = "yes" && type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists openssl; then
     if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
       found_openssl=yes
       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
@@ -2596,7 +2596,7 @@ AC_DEFUN([PHP_SETUP_LIBXML], [
     fi

     dnl If pkg-config is found try using it
-    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libxml-2.0; then
+    if type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists libxml-2.0; then
       if $PKG_CONFIG --atleast-version=2.6.11 libxml-2.0; then
         found_libxml=yes
         LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0`
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 10055837..c13fc413 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -10,7 +10,7 @@ if test "$PHP_CURL" != "no"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   fi

-  if test -x "$PKG_CONFIG"; then
+  if type -P "$PKG_CONFIG" >/dev/null; then
     dnl using pkg-config output

     AC_MSG_CHECKING(for libcurl.pc)
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 21fd94c8..fb77ffe5 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -395,7 +395,7 @@ PHP_ARG_WITH(iodbc,,
     if test -z "$PKG_CONFIG"; then
       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     fi
-    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
+    if type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists libiodbc ; then
       PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
       ODBC_TYPE=iodbc
       ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index 1b6dd0e1..2c75063d 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -74,7 +74,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
     AC_MSG_RESULT([yes])
     dnl First try to find pkg-config
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+    if type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists openssl; then
       PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
     fi
   else
diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4
index 9388fc21..225f7e2f 100644
--- a/ext/sodium/config.m4
+++ b/ext/sodium/config.m4
@@ -17,7 +17,7 @@ if test "$PHP_SODIUM" != "no"; then
     AC_MSG_RESULT([found in $PHP_SODIUM])

   dnl pkg-config output
-  elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsodium; then
+  elif type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists libsodium; then
     LIBSODIUM_VERSION=`$PKG_CONFIG libsodium --modversion`
     if $PKG_CONFIG libsodium --atleast-version=1.0.8; then
       LIBSODIUM_CFLAGS=`$PKG_CONFIG libsodium --cflags`
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 58c78538..7f68011d 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -62,7 +62,7 @@ if test "$PHP_ZIP" != "no"; then
       LIBZIP_LIBDIR="$PHP_LIBZIP/$PHP_LIBDIR"
       AC_MSG_RESULT(from option: found in $PHP_LIBZIP)

-    elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libzip; then
+    elif type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists libzip; then
       if $PKG_CONFIG libzip --atleast-version 0.11; then
         LIBZIP_CFLAGS=`$PKG_CONFIG libzip --cflags`
         LIBZIP_LIBDIR=`$PKG_CONFIG libzip --variable=libdir`
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 4cf4ba49..864c707d 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -593,7 +593,7 @@ if test "$PHP_FPM" != "no"; then
     unset SYSTEMD_LIBS
     unset SYSTEMD_INCS

-    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then
+    if type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists libsystemd; then
       dnl systemd version >= 209 provides libsystemd
       AC_MSG_CHECKING([for libsystemd])
       SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd`
@@ -601,7 +601,7 @@ if test "$PHP_FPM" != "no"; then
       SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd`
       AC_MSG_RESULT([version $SYSTEMD_VERS])

-    elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd-daemon; then
+    elif type -P "$PKG_CONFIG" >/dev/null && $PKG_CONFIG --exists libsystemd-daemon; then
       dnl systemd version < 209 provides libsystemd-daemon
       AC_MSG_CHECKING([for libsystemd-daemon])
       SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd-daemon`

timokau

I propose we prioritize fixing the breakage asap and merge this now. The warnings could be taken care of in a follow up PR.

timokau · 2020-06-14T09:44:06Z

pkgs/development/interpreters/php/default.nix

-          preConfigure = ''
-            # Don't record the configure flags since this causes unnecessary
-            # runtime dependencies
+          preConfigure =


It would probably have been better to skip the whitespace changes here, since they will cause rebuilds for pho >= 7.4. ofBorg says its in the <=500 range though, which should be okay.

True, as this is a rush fix.

I should put in some docs somewhere that comments outside of string literals is preferred for sake of rebuilds, so as I am not tempted to do this on a case-by-case basis so much :).

timokau · 2020-06-14T10:30:25Z

Merging, since only already broken derivations are affected (plus whitespace changes).

php < 7.4: Fix validation of PKG_CONFIG var

c1b9f86

They were assuming it is an absolute path, but it (conventionally) can be something to look up on the PATH too. Fixes NixOS#90202

ofborg bot requested review from talyz, aanderse, etu, globin and Ma27 June 13, 2020 19:15

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 labels Jun 13, 2020

Ericson2314 mentioned this pull request Jun 13, 2020

php: configure error - your system does not support systemd #90202

Closed

timokau approved these changes Jun 14, 2020

View reviewed changes

timokau merged commit 20e62aa into NixOS:master Jun 14, 2020

Ericson2314 deleted the fix-old-php branch June 14, 2020 19:06

pbogdan mentioned this pull request Aug 16, 2020

zabbix.server-mysql and zabbix.server-pgsql broken on master #95532

Closed

jtojnar mentioned this pull request May 1, 2022

flake.lock: Update fossar/nix-phps#101

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

php < 7.4: Fix validation of PKG_CONFIG var #90249

php < 7.4: Fix validation of PKG_CONFIG var #90249

Ericson2314 commented Jun 13, 2020

Izorkin commented Jun 14, 2020

Izorkin commented Jun 14, 2020

timokau left a comment

timokau Jun 14, 2020

Ericson2314 Jun 14, 2020

timokau commented Jun 14, 2020

php < 7.4: Fix validation of PKG_CONFIG var #90249

php < 7.4: Fix validation of PKG_CONFIG var #90249

Conversation

Ericson2314 commented Jun 13, 2020

Motivation for this change

Things done

Izorkin commented Jun 14, 2020

Izorkin commented Jun 14, 2020

timokau left a comment

Choose a reason for hiding this comment

timokau Jun 14, 2020

Choose a reason for hiding this comment

Ericson2314 Jun 14, 2020

Choose a reason for hiding this comment

timokau commented Jun 14, 2020