diff --git a/dev-lang/python/patches/python3.10-3.10.16.patchset b/dev-lang/python/patches/python3.10-3.10.17.patchset similarity index 100% rename from dev-lang/python/patches/python3.10-3.10.16.patchset rename to dev-lang/python/patches/python3.10-3.10.17.patchset diff --git a/dev-lang/python/python3.10-3.10.16.recipe b/dev-lang/python/python3.10-3.10.17.recipe similarity index 71% rename from dev-lang/python/python3.10-3.10.16.recipe rename to dev-lang/python/python3.10-3.10.17.recipe index 397c93d37..2a4c38003 100644 --- a/dev-lang/python/python3.10-3.10.16.recipe +++ b/dev-lang/python/python3.10-3.10.17.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2024 Python Software Foundation" REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1" +CHECKSUM_SHA256="4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0" SOURCE_DIR="Python-$portVersion" pyShortVer="${portVersion%.*}" @@ -53,6 +53,9 @@ packageTests=false # Set to "false" for faster local/test builds. Around 4 to 5 times faster that way. optimizedBuild=true +# Set to true to build with "-g" and create a _debuginfo package. +buildWithDebugInfo=true + # Run all tests by default. Set to "true" to make "hp --test" only run then known failing tests. runOnlyKnownFailingTests=false @@ -141,6 +144,83 @@ if $packageTests; then " fi +if $buildWithDebugInfo; then + defineDebugInfoPackage python$pyShortVer$secondaryArchSuffix \ + $prefix/bin/python$pyShortVer \ + $libDir/libpython$pyShortVer.so.1.0 \ + $libDir/python$pyShortVer/lib-dynload/_asyncio.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_bisect.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_blake2.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_bz2.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_codecs_cn.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_codecs_hk.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_codecs_iso2022.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_codecs_jp.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_codecs_kr.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_codecs_tw.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_contextvars.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_crypt.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_csv.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_ctypes_test.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_ctypes.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_curses_panel.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_curses.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_datetime.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_decimal.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_elementtree.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_hashlib.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_heapq.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_json.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_lsprof.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_lzma.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_md5.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_multibytecodec.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_multiprocessing.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_opcode.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_pickle.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_posixshmem.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_posixsubprocess.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_queue.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_random.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_sha1.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_sha256.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_sha3.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_sha512.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_socket.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_sqlite3.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_ssl.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_statistics.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_struct.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_testbuffer.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_testcapi.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_testclinic.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_testimportmultiple.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_testinternalcapi.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_testmultiphase.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_xxsubinterpreters.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_xxtestfuzz.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/_zoneinfo.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/array.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/audioop.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/binascii.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/cmath.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/fcntl.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/grp.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/math.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/mmap.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/pyexpat.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/readline.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/resource.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/select.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/spwd.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/syslog.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/termios.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/unicodedata.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/xxlimited_35.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/xxlimited.cpython-310.so \ + $libDir/python$pyShortVer/lib-dynload/zlib.cpython-310.so +fi + BUILD() { autoupdate @@ -157,6 +237,9 @@ BUILD() # -NDEBUG gets added by ./configure unless "--with-assertions" is used. export BASECFLAGS="-pipe -D_BSD_SOURCE" + if $buildWithDebugInfo; then + export BASECFLAGS="$BASECFLAG -g" + fi export OPT="-fwrapv -Wall" # remove "-g" until we use "defineDebugInfoPackage". if $optimizedBuild; then @@ -196,6 +279,10 @@ INSTALL() rm $libDir/libpython3.so + # remove some cruft: + rm $prefix/lib/python$pyShortVer/config-$pyShortVer/libpython$pyShortVer.a + rm $prefix/lib/python$pyShortVer/config-$pyShortVer/python.o + # No point in having this if we don't have a working tkinter. if ! $enableTkinter; then rm $prefix/bin/idle$pyShortVer