- first batch of rediffed patches

[packages/php.git] / php-config-dir.patch

diff --git a/php-config-dir.patch b/php-config-dir.patch
index b6abad556b3ecf5b1609d9c013ffc65292339ff3..349af3d074ef54927d7b9820cffa098ce7b0b988 100644 (file)
--- a/php-config-dir.patch
+++ b/php-config-dir.patch
@@ -1,14 +1,15 @@
---- php-5.2.0/scripts/php-config.in    2006-12-14 01:11:33.348180526 +0200
-+++ php-5.2.4/scripts/php-config.in    2007-08-31 19:43:04.061307670 +0300
-@@ -2,6 +2,7 @@
- 
+diff -urNp -x '*.orig' php-7.2.34.org/scripts/php-config.in php-7.2.34/scripts/php-config.in
+--- php-7.2.34.org/scripts/php-config.in       2020-09-30 07:15:50.000000000 +0200
++++ php-7.2.34/scripts/php-config.in   2021-08-24 01:07:32.526591111 +0200
+@@ -4,6 +4,7 @@ SED="@SED@"
  prefix="@prefix@"
+ datarootdir="@datarootdir@"
  exec_prefix="@exec_prefix@"
 +sysconfdir='@sysconfdir@'
  version="@PHP_VERSION@"
- version_id="@PHP_VERSION_ID@"
- includedir="@includedir@/php"
-@@ -53,6 +54,8 @@
+ vernum="@PHP_VERSION_ID@"
+ include_dir="@includedir@/php"
+@@ -55,6 +56,8 @@ case "$1" in
    echo $extension_dir;;
  --include-dir)
    echo $include_dir;;
@@ -17,11 +18,11 @@
  --php-binary)
    echo $php_binary;;
  --php-sapis)
-@@ -72,6 +75,7 @@
+@@ -76,6 +79,7 @@ Options:
    --ldflags           [$ldflags]
    --libs              [$libs]
    --extension-dir     [$extension_dir]
 +  --sysconfdir        [$sysconfdir]
    --include-dir       [$include_dir]
+   --man-dir           [$man_dir]
    --php-binary        [$php_binary]
-   --php-sapis         [$php_sapis]