Date: Wed, 9 Mar 2022 18:39:44 +0100 From: Piotr Kubaj <pkubaj@anongoth.pl> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 9a31e1b6d3bf - main - lang/python3*: add LTO option and enable by default everywhere except powerpc64 and riscv64 Message-ID: <YijmYIOQJBrwLx8a@KGPE-D16> In-Reply-To: <202203091735.229HZFxR093214@gitrepo.freebsd.org> References: <202203091735.229HZFxR093214@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--tmtv3q0Dc0KIndPP Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I meant: Approved by: python (maintainer timeout, koobs got his commit bit revoke= d during review process) On 22-03-09 17:35:15, Piotr Kubaj wrote: > The branch main has been updated by pkubaj: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D9a31e1b6d3bff1eef9fcd5e7= 2268c238ec5335fb >=20 > commit 9a31e1b6d3bff1eef9fcd5e72268c238ec5335fb > Author: Piotr Kubaj <pkubaj@FreeBSD.org> > AuthorDate: 2022-03-09 17:30:00 +0000 > Commit: Piotr Kubaj <pkubaj@FreeBSD.org> > CommitDate: 2022-03-09 17:30:00 +0000 >=20 > lang/python3*: add LTO option and enable by default everywhere except= powerpc64 and riscv64 > =20 > PR: 261974 > Approved by: python (koobs got his commit bit revoked during revie= w process) > --- > lang/python310/Makefile | 9 +++++++-- > lang/python310/files/patch-configure | 11 +++++++++++ > lang/python311/Makefile | 9 +++++++-- > lang/python311/files/patch-configure | 11 +++++++++++ > lang/python37/Makefile | 10 +++++++--- > lang/python37/files/patch-configure | 11 +++++++++++ > lang/python38/Makefile | 10 +++++++--- > lang/python38/files/patch-configure | 11 +++++++++++ > lang/python39/Makefile | 9 +++++++-- > lang/python39/files/patch-configure | 11 +++++++++++ > 10 files changed, 90 insertions(+), 12 deletions(-) >=20 > diff --git a/lang/python310/Makefile b/lang/python310/Makefile > index 8084d9b8c66a..dd524e80e451 100644 > --- a/lang/python310/Makefile > +++ b/lang/python310/Makefile > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D python > DISTVERSION=3D ${PYTHON_DISTVERSION} > +PORTREVISION=3D 1 > CATEGORIES=3D lang python > MASTER_SITES=3D PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} > PKGNAMESUFFIX=3D ${PYTHON_SUFFIX} > @@ -52,8 +53,10 @@ PLIST_SUB=3D ABI=3D${ABIFLAGS} \ > XYZDOT=3D${DISTVERSION:C/[a-z].*//} \ > OSMAJOR=3D${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in= pkg-plist. https://bugs.python.org/issue19554 > =20 > -OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC NLS PYMALLOC > -OPTIONS_DEFAULT=3D LIBMPDEC PYMALLOC > +OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC > +OPTIONS_DEFAULT=3D LIBMPDEC LTO PYMALLOC > +OPTIONS_EXCLUDE_powerpc64=3D LTO > +OPTIONS_EXCLUDE_riscv64=3D LTO > OPTIONS_RADIO=3D HASH > OPTIONS_RADIO_HASH=3D FNV SIPHASH > OPTIONS_SUB=3D yes > @@ -75,6 +78,8 @@ IPV6_CONFIGURE_ENABLE=3D ipv6 > LIBMPDEC_CONFIGURE_ON=3D --with-system-libmpdec > LIBMPDEC_LIB_DEPENDS=3D libmpdec.so:math/mpdecimal > =20 > +LTO_CONFIGURE_ON=3D --with-lto > + > # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and p= yexpat > # to break in Python 2.7, or preprocessor complaints in Python >=3D 3.3 > # Upstream Issue: https://bugs.python.org/issue6299 > diff --git a/lang/python310/files/patch-configure b/lang/python310/files/= patch-configure > new file mode 100644 > index 000000000000..c78047439605 > --- /dev/null > +++ b/lang/python310/files/patch-configure > @@ -0,0 +1,11 @@ > +--- configure.orig 2022-02-23 19:52:00 UTC > ++++ configure > +@@ -6625,7 +6625,7 @@ fi > +=20 > + if test "$Py_LTO" =3D 'true' ; then > + case $CC in > +- *clang*) > ++ *clang*|cc) > +=20 > + if test -n "$ac_tool_prefix"; then > + # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be = a program name with args. > diff --git a/lang/python311/Makefile b/lang/python311/Makefile > index 676094889cc5..2cf3cc6bdb44 100644 > --- a/lang/python311/Makefile > +++ b/lang/python311/Makefile > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D python > DISTVERSION=3D ${PYTHON_DISTVERSION} > +PORTREVISION=3D 1 > CATEGORIES=3D lang python > MASTER_SITES=3D PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} > PKGNAMESUFFIX=3D ${PYTHON_SUFFIX} > @@ -52,8 +53,10 @@ PLIST_SUB=3D ABI=3D${ABIFLAGS} \ > XYZDOT=3D${DISTVERSION:C/[a-z].*//} \ > OSMAJOR=3D${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in= pkg-plist. https://bugs.python.org/issue19554 > =20 > -OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC NLS PYMALLOC > -OPTIONS_DEFAULT=3D LIBMPDEC PYMALLOC > +OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC > +OPTIONS_DEFAULT=3D LIBMPDEC LTO PYMALLOC > +OPTIONS_EXCLUDE_powerpc64=3D LTO > +OPTIONS_EXCLUDE_riscv64=3D LTO > OPTIONS_RADIO=3D HASH > OPTIONS_RADIO_HASH=3D FNV SIPHASH > OPTIONS_SUB=3D yes > @@ -75,6 +78,8 @@ IPV6_CONFIGURE_ENABLE=3D ipv6 > LIBMPDEC_CONFIGURE_ON=3D --with-system-libmpdec > LIBMPDEC_LIB_DEPENDS=3D libmpdec.so:math/mpdecimal > =20 > +LTO_CONFIGURE_ON=3D --with-lto=3Dthin > + > # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and p= yexpat > # to break in Python 2.7, or preprocessor complaints in Python >=3D 3.3 > # Upstream Issue: https://bugs.python.org/issue6299 > diff --git a/lang/python311/files/patch-configure b/lang/python311/files/= patch-configure > new file mode 100644 > index 000000000000..aa89baed8cc0 > --- /dev/null > +++ b/lang/python311/files/patch-configure > @@ -0,0 +1,11 @@ > +--- configure.orig 2022-02-23 19:32:58 UTC > ++++ configure > +@@ -7244,7 +7244,7 @@ fi > +=20 > + if test "$Py_LTO" =3D 'true' ; then > + case $CC in > +- *clang*) > ++ *clang*|cc) > + LDFLAGS_NOLTO=3D"-fno-lto" > +=20 > + if test -n "$ac_tool_prefix"; then > diff --git a/lang/python37/Makefile b/lang/python37/Makefile > index 43de00c66dd0..442732efc459 100644 > --- a/lang/python37/Makefile > +++ b/lang/python37/Makefile > @@ -2,7 +2,7 @@ > =20 > PORTNAME=3D python > DISTVERSION=3D ${PYTHON_DISTVERSION} > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D lang python > MASTER_SITES=3D PYTHON/ftp/python/${DISTVERSION} > PKGNAMESUFFIX=3D ${PYTHON_SUFFIX} > @@ -49,8 +49,10 @@ PLIST_SUB=3D ABI=3D${ABIFLAGS} \ > XYZDOT=3D${DISTVERSION} \ > OSMAJOR=3D${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in= pkg-plist. https://bugs.python.org/issue19554 > =20 > -OPTIONS_DEFINE=3D DEBUG IPV6 NLS PYMALLOC > -OPTIONS_DEFAULT=3D PYMALLOC > +OPTIONS_DEFINE=3D DEBUG IPV6 LTO NLS PYMALLOC > +OPTIONS_DEFAULT=3D LTO PYMALLOC > +OPTIONS_EXCLUDE_powerpc64=3D LTO > +OPTIONS_EXCLUDE_riscv64=3D LTO > OPTIONS_RADIO=3D HASH > OPTIONS_RADIO_HASH=3D FNV SIPHASH > OPTIONS_SUB=3D yes > @@ -68,6 +70,8 @@ SIPHASH_CONFIGURE_ON=3D --with-hash-algorithm=3Dsiphash= 24 > DEBUG_CONFIGURE_WITH=3D pydebug > IPV6_CONFIGURE_ENABLE=3D ipv6 > =20 > +LTO_CONFIGURE_ON=3D --with-lto > + > # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and p= yexpat > # to break in Python 2.7, or preprocessor complaints in Python >=3D 3.3 > # Upstream Issue: https://bugs.python.org/issue6299 > diff --git a/lang/python37/files/patch-configure b/lang/python37/files/pa= tch-configure > new file mode 100644 > index 000000000000..c78047439605 > --- /dev/null > +++ b/lang/python37/files/patch-configure > @@ -0,0 +1,11 @@ > +--- configure.orig 2022-02-23 19:52:00 UTC > ++++ configure > +@@ -6625,7 +6625,7 @@ fi > +=20 > + if test "$Py_LTO" =3D 'true' ; then > + case $CC in > +- *clang*) > ++ *clang*|cc) > +=20 > + if test -n "$ac_tool_prefix"; then > + # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be = a program name with args. > diff --git a/lang/python38/Makefile b/lang/python38/Makefile > index 14fa1346d41c..d5a3247abef1 100644 > --- a/lang/python38/Makefile > +++ b/lang/python38/Makefile > @@ -2,7 +2,7 @@ > =20 > PORTNAME=3D python > DISTVERSION=3D ${PYTHON_DISTVERSION} > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D lang python > MASTER_SITES=3D PYTHON/ftp/python/${DISTVERSION} > PKGNAMESUFFIX=3D ${PYTHON_SUFFIX} > @@ -52,8 +52,10 @@ PLIST_SUB=3D ABI=3D${ABIFLAGS} \ > XYZDOT=3D${DISTVERSION} \ > OSMAJOR=3D${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in= pkg-plist. https://bugs.python.org/issue19554 > =20 > -OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC NLS PYMALLOC > -OPTIONS_DEFAULT=3D LIBMPDEC PYMALLOC > +OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC > +OPTIONS_DEFAULT=3D LIBMPDEC LTO PYMALLOC > +OPTIONS_EXCLUDE_powerpc64=3D LTO > +OPTIONS_EXCLUDE_riscv64=3D LTO > OPTIONS_RADIO=3D HASH > OPTIONS_RADIO_HASH=3D FNV SIPHASH > OPTIONS_SUB=3D yes > @@ -75,6 +77,8 @@ IPV6_CONFIGURE_ENABLE=3D ipv6 > LIBMPDEC_CONFIGURE_ON=3D --with-system-libmpdec > LIBMPDEC_LIB_DEPENDS=3D libmpdec.so:math/mpdecimal > =20 > +LTO_CONFIGURE_ON=3D --with-lto > + > # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and p= yexpat > # to break in Python 2.7, or preprocessor complaints in Python >=3D 3.3 > # Upstream Issue: https://bugs.python.org/issue6299 > diff --git a/lang/python38/files/patch-configure b/lang/python38/files/pa= tch-configure > new file mode 100644 > index 000000000000..c78047439605 > --- /dev/null > +++ b/lang/python38/files/patch-configure > @@ -0,0 +1,11 @@ > +--- configure.orig 2022-02-23 19:52:00 UTC > ++++ configure > +@@ -6625,7 +6625,7 @@ fi > +=20 > + if test "$Py_LTO" =3D 'true' ; then > + case $CC in > +- *clang*) > ++ *clang*|cc) > +=20 > + if test -n "$ac_tool_prefix"; then > + # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be = a program name with args. > diff --git a/lang/python39/Makefile b/lang/python39/Makefile > index 25a7509e4959..8185af11c466 100644 > --- a/lang/python39/Makefile > +++ b/lang/python39/Makefile > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D python > DISTVERSION=3D ${PYTHON_DISTVERSION} > +PORTREVISION=3D 1 > CATEGORIES=3D lang python > MASTER_SITES=3D PYTHON/ftp/python/${DISTVERSION} > PKGNAMESUFFIX=3D ${PYTHON_SUFFIX} > @@ -52,8 +53,10 @@ PLIST_SUB=3D ABI=3D${ABIFLAGS} \ > XYZDOT=3D${DISTVERSION} \ > OSMAJOR=3D${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in= pkg-plist. https://bugs.python.org/issue19554 > =20 > -OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC NLS PYMALLOC > -OPTIONS_DEFAULT=3D LIBMPDEC PYMALLOC > +OPTIONS_DEFINE=3D DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC > +OPTIONS_DEFAULT=3D LIBMPDEC LTO PYMALLOC > +OPTIONS_EXCLUDE_powerpc64=3D LTO > +OPTIONS_EXCLUDE_riscv64=3D LTO > OPTIONS_RADIO=3D HASH > OPTIONS_RADIO_HASH=3D FNV SIPHASH > OPTIONS_SUB=3D yes > @@ -75,6 +78,8 @@ IPV6_CONFIGURE_ENABLE=3D ipv6 > LIBMPDEC_CONFIGURE_ON=3D --with-system-libmpdec > LIBMPDEC_LIB_DEPENDS=3D libmpdec.so:math/mpdecimal > =20 > +LTO_CONFIGURE_ON=3D --with-lto > + > # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and p= yexpat > # to break in Python 2.7, or preprocessor complaints in Python >=3D 3.3 > # Upstream Issue: https://bugs.python.org/issue6299 > diff --git a/lang/python39/files/patch-configure b/lang/python39/files/pa= tch-configure > new file mode 100644 > index 000000000000..c78047439605 > --- /dev/null > +++ b/lang/python39/files/patch-configure > @@ -0,0 +1,11 @@ > +--- configure.orig 2022-02-23 19:52:00 UTC > ++++ configure > +@@ -6625,7 +6625,7 @@ fi > +=20 > + if test "$Py_LTO" =3D 'true' ; then > + case $CC in > +- *clang*) > ++ *clang*|cc) > +=20 > + if test -n "$ac_tool_prefix"; then > + # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be = a program name with args. --tmtv3q0Dc0KIndPP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmIo5mAACgkQelmbhSCD nJ02mxAAlhZDSed2X53arkC0o3Fsh4ZmMatM7qluDoxdpIe8NDG3yFlLX39wTa0Y j80njCHoqdOnMYu6jq/1EgfVF+cd7UPj27KMLmeS6qp3F9GzGmcHcTVR5yokFx76 upyUPGGSRKF2/WIy2PuUXFiW0WlJ/85AGporM48mwddYTgo170BgoHB4ZpoQH5mO nvee6shYp/ZpiN76y7SmE3zFdeMT58jrXucBscEdJmbfubF3HhvqReH+HZwZF/D2 vXR6uFoA7sUQclIAMTmQfxLa/G0gQZ2By6oaxI5JcuBqFH3RSwoKYeW5GOIPDRNu GCGcUYzMQ/oDZVtAB5/n1niBlESAs5PK5kYQGC+/p++K2eWrXNMwhcfBo93sTch1 w67qFFrpx7nmEUC2M0kg34oSeAuurbeVUUEVZIazKH5Blpdylck9mbAFt3lqcPSV 21zhcDzwsBiFEQbjqoIjtcqq7PbF0QVxDymoNk0N1K+Fg5MKNCpmgNEe9kcWdLSa HwVPJHHq657e6Tm7mUH2lQ0M3jOiQZ++SVUr9ttoL5zmKREqdXbcfZO2phNmQ1qq UbUNo3jGc1D3g2YguNg5yo4T2qs6aZtD3tQC9TToSmm2B95igQgqTG+lrVy8kMaq JEAE6JXc0z1UMGmVI8tAFGA2QG3hT87WiZdTQnT4cFMCSSM9PuY= =Cjic -----END PGP SIGNATURE----- --tmtv3q0Dc0KIndPP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YijmYIOQJBrwLx8a>