Magellan Linux

Contents of /trunk/php/patches/php-7.3.19-multilib.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3540 - (show annotations) (download)
Thu Jul 9 07:15:51 2020 UTC (3 years, 9 months ago) by niro
File size: 930 byte(s)
-rediffed for 7.3.19
1 diff -Naur php-7.3.19/acinclude.m4 php-7.3.19-magellan/acinclude.m4
2 --- php-7.3.19/acinclude.m4 2020-06-09 10:06:39.000000000 +0200
3 +++ php-7.3.19-magellan/acinclude.m4 2020-07-09 09:14:10.666930144 +0200
4 @@ -443,7 +443,7 @@
5 dnl Adds a path to linkpath/runpath (LDFLAGS)
6 dnl
7 AC_DEFUN([PHP_ADD_LIBPATH],[
8 - if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" != "/usr/lib"; then
9 + if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" != "/usr/lib" && test "$1" != "/usr/lib64"; then
10 PHP_EXPAND_PATH($1, ai_p)
11 ifelse([$2],,[
12 _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
13 @@ -2083,7 +2083,7 @@
14 dnl Search for the sendmail binary
15 dnl
16 AC_DEFUN([PHP_PROG_SENDMAIL], [
17 - PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
18 + PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib:/usr/lib64
19 AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH)
20 PHP_SUBST(PROG_SENDMAIL)
21 ])