diff --git a/srcpkgs/php8.3/patches/ac_fn_c_try_run_cross.patch b/srcpkgs/php8.3/patches/ac_fn_c_try_run_cross.patch new file mode 100644 index 00000000000..e0a5d3cf2b1 --- /dev/null +++ b/srcpkgs/php8.3/patches/ac_fn_c_try_run_cross.patch @@ -0,0 +1,176 @@ +diff --git a/configure b/configure +index b6c740b..550e313 100755 +--- a/configure ++++ b/configure +@@ -2600,7 +2600,13 @@ printf "%s\n" "$ac_try_echo"; } >&5 + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" + printf "%s\n" "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 ++ if test "$cross_compiling" = "yes"; then ++ # Use qemu-user-static to run the executable ++ qemu_exec="QEMU_LD_PREFIX=${XBPS_CROSS_BASE} qemu-${XBPS_TARGET_QEMU_MACHINE}-static" ++ (eval "$qemu_exec $ac_try") 2>&5 ++ else ++ (eval "$ac_try") 2>&5 ++ fi + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +@@ -39741,13 +39741,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -39786,7 +39779,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -39810,13 +39802,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -39855,7 +39840,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -39879,13 +39863,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -39924,7 +39901,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -39948,13 +39924,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -39993,7 +39962,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -40017,13 +39985,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -40062,7 +40023,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -40086,13 +40046,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -40131,7 +40084,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -40155,13 +40107,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- if test "$cross_compiling" = yes +-then : +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -40200,7 +40145,6 @@ printf "%s\n" "no" >&6; } + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } diff --git a/srcpkgs/php8.3/patches/php-cross-config.patch b/srcpkgs/php8.3/patches/php-cross-config.patch index 141c3f0a0e6..c84e4497436 100644 --- a/srcpkgs/php8.3/patches/php-cross-config.patch +++ b/srcpkgs/php8.3/patches/php-cross-config.patch @@ -8,7 +8,7 @@ index d317fd7..5560d75 100755 - if test -n "$PG_CONFIG"; then + if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 $as_echo "$PG_CONFIG" >&6; } PGSQL_INCLUDE=`$PG_CONFIG --includedir` @@ -62422,7 +62422,7 @@ $as_echo_n "checking for pg_config... " >&6; } @@ -17,6 +17,6 @@ index d317fd7..5560d75 100755 - if test -n "$PG_CONFIG"; then + if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 $as_echo "$PG_CONFIG" >&6; } PGSQL_INCLUDE=`$PG_CONFIG --includedir` diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template index 5400dfb8db3..f95ee61e305 100644 --- a/srcpkgs/php8.3/template +++ b/srcpkgs/php8.3/template @@ -1,7 +1,7 @@ # Template file for 'php8.3' # rebuild php8.3-apcu and php8.3-imagick when updating this package pkgname=php8.3 -version=8.3.9 +version=8.3.10 revision=1 _php_version=8.3 hostmakedepends="bison pkg-config apache-devel" @@ -18,7 +18,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS" # this is the source where the www.php.net code pulls the tarballs it serves # at https://www.php.net/distributions/ distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz" -checksum=f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566 +checksum=d0b4dd5ff465053248fd28dacf2fe0bed79deaaef657890cecb6bfcb73996dcd provides="php-runtime-${version}_1" conf_files="/etc/php${_php_version}/php.ini" @@ -27,7 +27,7 @@ lib32disabled=yes if [ -n "$CROSS_BUILD" ]; then # phar and pear need php to build - hostmakedepends+=" php${_php_version}" + hostmakedepends+=" php${_php_version} qemu-user-static" CFLAGS+=" -DHAVE_LIBDL -DHAVE_DLOPEN -DHAVE_DLSYM