Re: CVS commit: pkgsrc/lang/python313

[Ryo ONODERA <ryo%tetera.org@localhost>]

Hi,

The following part is still in work-in-progress
or it can be converted to math/mpdecimal?

> @@ -242,6 +224,7 @@ CONFIGURE_ENV+=           ac_cv_lib_intl_textdoma
>  .include "../../devel/libuuid/buildlink3.mk"
>  .include "../../devel/zlib/buildlink3.mk"
>  .include "../../security/openssl/buildlink3.mk"
> +#.include "../../wip/mpdecimal/buildlink3.mk"
>  .include "../../textproc/expat/buildlink3.mk"
>  .include "../../mk/atomic64.mk"
>  .include "../../mk/bdb.buildlink3.mk"

Thank you.

"Thomas Klausner" <wiz%netbsd.org@localhost> writes:

> Module Name:  pkgsrc
> Committed By: wiz
> Date:         Tue Dec 24 10:47:51 UTC 2024
>
> Modified Files:
>       pkgsrc/lang/python313: Makefile distinfo
>       pkgsrc/lang/python313/patches: patch-configure
>
> Log Message:
> python313: fix float detection on x86.
>
> While here:
> - remove partial HPUX support (no corresponding PLIST, so I don't see
>   how this can work)
> - remove libpanelw workaround - the configure script falls back to
>   libpanel on its own
> - remove workaround for opcodes.h - seems to work now
> - allow network access for self tests
> - remove references to non-existent files
>
> Bump PKGREVISION.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python313/Makefile
> cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python313/distinfo
> cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python313/patches/patch-configure
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> Modified files:
>
> Index: pkgsrc/lang/python313/Makefile
> diff -u pkgsrc/lang/python313/Makefile:1.7 pkgsrc/lang/python313/Makefile:1.8
> --- pkgsrc/lang/python313/Makefile:1.7        Fri Dec  6 06:19:12 2024
> +++ pkgsrc/lang/python313/Makefile    Tue Dec 24 10:47:51 2024
> @@ -1,6 +1,6 @@
> -# $NetBSD: Makefile,v 1.7 2024/12/06 06:19:12 riastradh Exp $
> +# $NetBSD: Makefile,v 1.8 2024/12/24 10:47:51 wiz Exp $
>  
> -PKGREVISION= 1
> +PKGREVISION= 2
>  .include "dist.mk"
>  
>  PKGNAME=     python313-${PY_DISTVERSION}
> @@ -48,13 +48,6 @@ CONFIGURE_ENV+=            py_cv_module__gdbm="n/a
>  CONFIGURE_ENV+=              py_cv_module_xxlimited="n/a"
>  PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
>  
> -# libpanelw seems to be a Linux thing?
> -SUBST_CLASSES+=              panel
> -SUBST_MESSAGE.panel= Replacing panelw with panel.
> -SUBST_STAGE.panel=   pre-configure
> -SUBST_FILES.panel+=  configure
> -SUBST_SED.panel+=    -e "s,panelw,panel,"
> -
>  PTHREAD_OPTS+=       require
>  .include "../../mk/pthread.buildlink3.mk"
>  
> @@ -147,7 +140,6 @@ REPLACE.python.old=       .*python[^ ]*
>  REPLACE.python.new=  ${PREFIX}/bin/python${PY_VER_SUFFIX}
>  REPLACE_FILES.python+=       Lib/base64.py
>  REPLACE_FILES.python+=       Lib/cProfile.py
> -REPLACE_FILES.python+=       Lib/cgi.py
>  REPLACE_FILES.python+=       Lib/encodings/rot_13.py
>  REPLACE_FILES.python+=       Lib/idlelib/pyshell.py
>  REPLACE_FILES.python+=       Lib/pdb.py
> @@ -180,7 +172,6 @@ REPLACE_FILES.python+=    Lib/turtledemo/pl
>  REPLACE_FILES.python+=       Lib/turtledemo/sorting_animate.py
>  REPLACE_FILES.python+=       Lib/turtledemo/tree.py
>  REPLACE_FILES.python+=       Lib/turtledemo/yinyang.py
> -REPLACE_FILES.python+=       Lib/uu.py
>  REPLACE_FILES.python+=       Lib/webbrowser.py
>  
>  # XXX: It might be needed to add manually more paths like ${PREFIX}/qt5/lib
> @@ -209,18 +200,6 @@ CHECK_WRKREF_SKIP+=      lib/python${PY_VER_S
>  CHECK_WRKREF_SKIP+=  lib/python${PY_VER_SUFFIX}/__pycache__/_sysconfigdata*
>  CHECK_WRKREF_SKIP+=  lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Makefile
>  
> -# Avoid error: Cannot generate ./Include/opcode.h, python not found !
> -post-configure:
> -     touch ${WRKSRC}/Include/opcode.h
> -
> -.if ${OPSYS} == "HPUX"
> -post-install: hpux-postinstall
> -.PHONY: hpux-postinstall
> -hpux-postinstall:
> -     ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython3.13.sl \
> -             ${DESTDIR}${PREFIX}/lib/libpython3.13.sl.1.0
> -.endif
> -
>  INSTALLATION_DIRS+=  lib/python${PY_VER_SUFFIX}/site-packages
>  
>  pre-install: setuptools-preinstall
> @@ -229,6 +208,9 @@ setuptools-preinstall:
>       ${INSTALL_DATA} ${.CURDIR}/../../devel/py-setuptools/files/_distutils_system_mod \
>               ${DESTDIR}${PREFIX}/lib/python${PY_VER_SUFFIX}/site-packages/_distutils_system_mod.py
>  
> +# for testing
> +ALLOW_NETWORK_ACCESS=        yes
> +
>  .if ${OPSYS} == "Linux"
>  .include "../../databases/gdbm_compat/buildlink3.mk"
>  .endif
> @@ -242,6 +224,7 @@ CONFIGURE_ENV+=           ac_cv_lib_intl_textdoma
>  .include "../../devel/libuuid/buildlink3.mk"
>  .include "../../devel/zlib/buildlink3.mk"
>  .include "../../security/openssl/buildlink3.mk"
> +#.include "../../wip/mpdecimal/buildlink3.mk"
>  .include "../../textproc/expat/buildlink3.mk"
>  .include "../../mk/atomic64.mk"
>  .include "../../mk/bdb.buildlink3.mk"
>
> Index: pkgsrc/lang/python313/distinfo
> diff -u pkgsrc/lang/python313/distinfo:1.3 pkgsrc/lang/python313/distinfo:1.4
> --- pkgsrc/lang/python313/distinfo:1.3        Thu Dec  5 07:54:03 2024
> +++ pkgsrc/lang/python313/distinfo    Tue Dec 24 10:47:51 2024
> @@ -1,4 +1,4 @@
> -$NetBSD: distinfo,v 1.3 2024/12/05 07:54:03 adam Exp $
> +$NetBSD: distinfo,v 1.4 2024/12/24 10:47:51 wiz Exp $
>  
>  BLAKE2s (Python-3.13.1.tar.xz) = fe3720650de367e5963e81d0bc421f22e4f0af814a57634efa9b628e94562b7b
>  SHA512 (Python-3.13.1.tar.xz) = 056c9b5fc0a6b540f41513d045f43c1ed463d15e0f345cecec703ec9c2335e53b4beb19de9c74ab2b236b023f934d5fd9ae7727a808634eaa01cfe66018a9a35
> @@ -9,4 +9,4 @@ SHA1 (patch-Lib_sysconfig_____init____.p
>  SHA1 (patch-Makefile.pre.in) = 744bccba4b582c8a6c8de5e1177c6912d6128718
>  SHA1 (patch-Modules_readline.c) = 232f6ac43b5a0e87c915f13117bae91ef069a6c1
>  SHA1 (patch-Modules_socketmodule.c) = 9d88a801af6e2cbd36b9935a46c8a86727222d56
> -SHA1 (patch-configure) = 42b893f9f12c341b4ecdaaf4ed93337eea064bf4
> +SHA1 (patch-configure) = 9abbc766a9c09473dfec2f83e3322e83080620bf
>
> Index: pkgsrc/lang/python313/patches/patch-configure
> diff -u pkgsrc/lang/python313/patches/patch-configure:1.2 pkgsrc/lang/python313/patches/patch-configure:1.3
> --- pkgsrc/lang/python313/patches/patch-configure:1.2 Thu Dec  5 07:54:03 2024
> +++ pkgsrc/lang/python313/patches/patch-configure     Tue Dec 24 10:47:51 2024
> @@ -1,9 +1,9 @@
> -$NetBSD: patch-configure,v 1.2 2024/12/05 07:54:03 adam Exp $
> +$NetBSD: patch-configure,v 1.3 2024/12/24 10:47:51 wiz Exp $
>  
> -Fix linking on Darwin; don't use -stack_size.
> -Changes for consistency across pkgsrc platforms.
> -Simplify _sysconfigdata to include only platform name.
> -Disable barrier to cross-compilation.
> +Chunks 1, 4, 5: Changes for consistency across pkgsrc platforms.
> +Chunk 1: Simplify _sysconfigdata to include only platform name.
> +Chunk 2: Disable barrier to cross-compilation.
> +Chunk 3: should probably be handled in the Makefile instead
>  
>  --- configure.orig   2024-12-03 17:59:52.000000000 +0000
>  +++ configure
> @@ -34,19 +34,6 @@ Disable barrier to cross-compilation.
>   
>   
>   
> -@@ -23719,10 +23719,10 @@ if ac_fn_c_try_link "$LINENO"
> - then :
> - 
> - 
> --if grep noonsees conftest$EXEEXT >/dev/null ; then
> -+if strings -a conftest.$ac_objext | grep noonsees >/dev/null ; then
> -   ax_cv_c_float_words_bigendian=yes
> - fi
> --if grep seesnoon conftest$EXEEXT >/dev/null ; then
> -+if strings -a conftest.$ac_objext | grep seesnoon >/dev/null ; then
> -   if test "$ax_cv_c_float_words_bigendian" = unknown; then
> -     ax_cv_c_float_words_bigendian=no
> -   else
>  @@ -24579,7 +24579,7 @@ printf "%s\n" "#define ALT_SOABI \"${ALT
>   fi
>   
>

-- 
Ryo ONODERA // ryo%tetera.org@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3