From 8d9e0240e9e307d0435142802735c176d0e4796b Mon Sep 17 00:00:00 2001 From: OscarL Date: Mon, 14 Apr 2025 15:09:39 +0000 Subject: [PATCH] python3.11: update to version 3.11.12. (#12151) --- ...1.patchset => python3.11-3.11.12.patchset} | 0 ...11.11.recipe => python3.11-3.11.12.recipe} | 21 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) rename dev-lang/python/patches/{python3.11-3.11.11.patchset => python3.11-3.11.12.patchset} (100%) rename dev-lang/python/{python3.11-3.11.11.recipe => python3.11-3.11.12.recipe} (95%) diff --git a/dev-lang/python/patches/python3.11-3.11.11.patchset b/dev-lang/python/patches/python3.11-3.11.12.patchset similarity index 100% rename from dev-lang/python/patches/python3.11-3.11.11.patchset rename to dev-lang/python/patches/python3.11-3.11.12.patchset diff --git a/dev-lang/python/python3.11-3.11.11.recipe b/dev-lang/python/python3.11-3.11.12.recipe similarity index 95% rename from dev-lang/python/python3.11-3.11.11.recipe rename to dev-lang/python/python3.11-3.11.12.recipe index 5211445eb..2e283d91c 100644 --- a/dev-lang/python/python3.11-3.11.11.recipe +++ b/dev-lang/python/python3.11-3.11.12.recipe @@ -10,10 +10,10 @@ Python is free to use, even for commercial products, because of its \ OSI-approved open source license." HOMEPAGE="https://www.python.org" LICENSE="Python" -COPYRIGHT="1990-2024 Python Software Foundation" +COPYRIGHT="1990-2025 Python Software Foundation" REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="2a9920c7a0cd236de33644ed980a13cbbc21058bfdc528febb6081575ed73be3" +CHECKSUM_SHA256="849da87af4df137710c1796e276a955f7a85c9f971081067c8f565d15c352a09" SOURCE_DIR="Python-$portVersion" pyShortVer="${portVersion%.*}" @@ -53,9 +53,15 @@ packageTests=false # Set to "false" for faster local/test builds. Around 4 to 5 times faster that way. optimizedBuild=true +# Generally, we disable parallel builds if "optimizedBuild == true" as they can fail. +forceParallelBuild=false + # Run all tests by default. Set to "true" to make "hp --test" only run then known failing tests. runOnlyKnownFailingTests=false +# Run only the tests that are generally excluded. Expect LOTS of hangs/crashes/etc. +runOnlyExcludedTests=false + # <<<[RECIPE OPTIONS] PROVIDES=" @@ -69,7 +75,6 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - timezone_data cmd:file lib:libbz2$secondaryArchSuffix lib:libedit$secondaryArchSuffix @@ -178,7 +183,7 @@ BUILD() --with-ensurepip=no \ --with-readline=editline \ --with-system-expat \ - --with-tzpath=$dataDir/zoneinfo \ + --with-tzpath=$(findpaths -c : B_FIND_PATH_DATA_DIRECTORY zoneinfo) \ --without-static-libpython # --with-lto # this one makes build times at least 2.5x slower. @@ -197,9 +202,11 @@ BUILD() # # Not using multiple jobs for make solves both the warnings and the possible error. - if $optimizedBuild; then + if $optimizedBuild && ! $forceParallelBuild; then + echo "Running make with: -j 1" make -j 1 else + echo "Running make with: $jobArgs" make $jobArgs fi } @@ -421,7 +428,9 @@ TEST() local -x LOGNAME=buildbot # this skips tests_tools/test_freeze, copied from Gentoo's ebuild - if $runOnlyKnownFailingTests; then + if $runOnlyExcludedTests; then + make $jobArgs test EXTRATESTOPTS="${test_options[*]} ${tests_to_exclude[*]}" + elif $runOnlyKnownFailingTests; then make $jobArgs test EXTRATESTOPTS="${test_options[*]} ${tests_that_fail[*]}" else # Runs the full test suite (minus the tests that we explicitly exclude).