diff --git a/srcpkgs/php/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php/patches/php-ltmain-sysroot-support.patch new file mode 100644 index 00000000000..bbe0a514a9e --- /dev/null +++ b/srcpkgs/php/patches/php-ltmain-sysroot-support.patch @@ -0,0 +1,39 @@ +--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200 ++++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200 +@@ -2375,6 +2375,13 @@ EOF + *) . ./$lib ;; + esac + ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#") ++ newdependency_libs="$newdependency_libs $deplib" ++ done ++ dependency_libs=${newdependency_libs} ++ + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -5750,6 +5757,13 @@ fi\ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac ++ ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#") ++ newdependency_libs="$newdependency_libs $deplib" ++ done ++ + $echo > $output "\ + # $outputname - a libtool library file + # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +@@ -5767,7 +5781,7 @@ library_names='$library_names' + old_library='$old_library' + + # Libraries that this one depends upon. +-dependency_libs='$dependency_libs' ++dependency_libs='$newdependency_libs' + + # Version information for $libname. + current=$current diff --git a/srcpkgs/php/template b/srcpkgs/php/template index c98c59815ac..927bbf8504f 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template file for 'php' pkgname=php version=7.4.14 -revision=5 +revision=6 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel