Skip to content

Commit

Permalink
contrib/php8.3: update to 8.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
nekopsykose committed Jul 2, 2024
1 parent ea1ac78 commit be3d946
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 119 deletions.

This file was deleted.

11 changes: 11 additions & 0 deletions contrib/php8.3/patches/testarg.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/build/Makefile.global
+++ b/build/Makefile.global
@@ -104,7 +104,7 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+ $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php $(PHP_RUN_TESTS_ARGS) -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
TEST_RESULT_EXIT_CODE=$$?; \
rm $(top_builddir)/tmp-php.ini; \
exit $$TEST_RESULT_EXIT_CODE; \
92 changes: 0 additions & 92 deletions contrib/php8.3/patches/visibility.patch

This file was deleted.

17 changes: 13 additions & 4 deletions contrib/php8.3/template.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgname = "php8.3"
_majver = "8.3"
pkgver = f"{_majver}.8"
pkgrel = 3
pkgver = f"{_majver}.9"
pkgrel = 0
_apiver = "20230831"
build_style = "gnu_configure"
configure_args = [
Expand Down Expand Up @@ -122,7 +122,7 @@
license = "PHP-3.01"
url = "https://www.php.net"
source = f"{url}/distributions/php-{pkgver}.tar.gz"
sha256 = "0ebed9f1471871cf131e504629f3947f2acd38a655cc31b036f99efd0e3dbdeb"
sha256 = "f484dec6ee005c83f899af02fc021e1bc3b1d7b3f143ca062ef66b0fcee96566"


def post_patch(self):
Expand Down Expand Up @@ -203,8 +203,17 @@ def post_patch(self):
"ext/simplexml/tests/bug79971_1.phpt",
"ext/soap/tests/bug69668.phpt",
"ext/soap/tests/bugs/bug42151.phpt",
# probably fails because of zlib-ng-compat
"ext/zlib/tests/bug48725.phpt",
# most of these try connect to an ldap server and wait for timeout then autoskip
"ext/ldap/tests/*.phpt",
]:
self.rm(f)
self.rm(f, glob=True)


def init_check(self):
# injected via patch
self.make_check_args += [f"PHP_RUN_TESTS_ARGS=-j{self.make_jobs}"]


def init_install(self):
Expand Down

0 comments on commit be3d946

Please sign in to comment.