Attachment #232057 for bug #261974

Lines 52-59 PLIST_SUB= ABI=${ABIFLAGS} \ Link Here

(-)b/lang/python310/Makefile (-2 / +6 lines)
52	XYZDOT=${DISTVERSION:C/[a-z].*//} \	52	XYZDOT=${DISTVERSION:C/[a-z].*//} \
53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
54		54
55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC NLS PYMALLOC	55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC
56	OPTIONS_DEFAULT= LIBMPDEC PYMALLOC	56	OPTIONS_DEFAULT= LIBMPDEC LTO PYMALLOC
		57	OPTIONS_EXCLUDE_powerpc64= LTO
		58	OPTIONS_EXCLUDE_riscv64= LTO
57	OPTIONS_RADIO= HASH	59	OPTIONS_RADIO= HASH
58	OPTIONS_RADIO_HASH= FNV SIPHASH	60	OPTIONS_RADIO_HASH= FNV SIPHASH
59	OPTIONS_SUB= yes	61	OPTIONS_SUB= yes
Lines 75-80 IPV6_CONFIGURE_ENABLE= ipv6 Link Here
75	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec	77	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec
76	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal	78	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal
77		79
		80	LTO_CONFIGURE_ON= --with-lto
		81
78	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat	82	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
79	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3	83	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
80	# Upstream Issue: https://bugs.python.org/issue6299	84	# Upstream Issue: https://bugs.python.org/issue6299

Added Link Here

(-)b/lang/python310/files/patch-configure (+11 lines)
1	--- configure.orig 2022-02-23 19:52:00 UTC
2	+++ configure
3	@@ -6625,7 +6625,7 @@ fi
4
5	if test "$Py_LTO" = 'true' ; then
6	case $CC in
7	- clang)
8	+ clang\|cc)
9
10	if test -n "$ac_tool_prefix"; then
11	# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.

Lines 52-59 PLIST_SUB= ABI=${ABIFLAGS} \ Link Here

(-)b/lang/python311/Makefile (-2 / +6 lines)
52	XYZDOT=${DISTVERSION:C/[a-z].*//} \	52	XYZDOT=${DISTVERSION:C/[a-z].*//} \
53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
54		54
55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC NLS PYMALLOC	55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC
56	OPTIONS_DEFAULT= LIBMPDEC PYMALLOC	56	OPTIONS_DEFAULT= LIBMPDEC LTO PYMALLOC
		57	OPTIONS_EXCLUDE_powerpc64= LTO
		58	OPTIONS_EXCLUDE_riscv64= LTO
57	OPTIONS_RADIO= HASH	59	OPTIONS_RADIO= HASH
58	OPTIONS_RADIO_HASH= FNV SIPHASH	60	OPTIONS_RADIO_HASH= FNV SIPHASH
59	OPTIONS_SUB= yes	61	OPTIONS_SUB= yes
Lines 75-80 IPV6_CONFIGURE_ENABLE= ipv6 Link Here
75	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec	77	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec
76	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal	78	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal
77		79
		80	LTO_CONFIGURE_ON= --with-lto=thin
		81
78	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat	82	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
79	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3	83	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
80	# Upstream Issue: https://bugs.python.org/issue6299	84	# Upstream Issue: https://bugs.python.org/issue6299

Added Link Here

(-)b/lang/python311/files/patch-configure (+11 lines)
1	--- configure.orig 2022-02-23 19:32:58 UTC
2	+++ configure
3	@@ -7244,7 +7244,7 @@ fi
4
5	if test "$Py_LTO" = 'true' ; then
6	case $CC in
7	- clang)
8	+ clang\|cc)
9	LDFLAGS_NOLTO="-fno-lto"
10
11	if test -n "$ac_tool_prefix"; then

Lines 49-56 PLIST_SUB= ABI=${ABIFLAGS} \ Link Here

(-)b/lang/python37/Makefile (-2 / +6 lines)
49	XYZDOT=${DISTVERSION} \	49	XYZDOT=${DISTVERSION} \
50	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	50	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
51		51
52	OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC	52	OPTIONS_DEFINE= DEBUG IPV6 LTO NLS PYMALLOC
53	OPTIONS_DEFAULT= PYMALLOC	53	OPTIONS_DEFAULT= LTO PYMALLOC
		54	OPTIONS_EXCLUDE_powerpc64= LTO
		55	OPTIONS_EXCLUDE_riscv64= LTO
54	OPTIONS_RADIO= HASH	56	OPTIONS_RADIO= HASH
55	OPTIONS_RADIO_HASH= FNV SIPHASH	57	OPTIONS_RADIO_HASH= FNV SIPHASH
56	OPTIONS_SUB= yes	58	OPTIONS_SUB= yes
Lines 68-73 SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 Link Here
68	DEBUG_CONFIGURE_WITH= pydebug	70	DEBUG_CONFIGURE_WITH= pydebug
69	IPV6_CONFIGURE_ENABLE= ipv6	71	IPV6_CONFIGURE_ENABLE= ipv6
70		72
		73	LTO_CONFIGURE_ON= --with-lto
		74
71	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat	75	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
72	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3	76	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
73	# Upstream Issue: https://bugs.python.org/issue6299	77	# Upstream Issue: https://bugs.python.org/issue6299

Added Link Here

(-)b/lang/python37/files/patch-configure (+11 lines)
1	--- configure.orig 2022-02-23 19:52:00 UTC
2	+++ configure
3	@@ -6625,7 +6625,7 @@ fi
4
5	if test "$Py_LTO" = 'true' ; then
6	case $CC in
7	- clang)
8	+ clang\|cc)
9
10	if test -n "$ac_tool_prefix"; then
11	# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.

Lines 52-59 PLIST_SUB= ABI=${ABIFLAGS} \ Link Here

(-)b/lang/python38/Makefile (-2 / +6 lines)
52	XYZDOT=${DISTVERSION} \	52	XYZDOT=${DISTVERSION} \
53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
54		54
55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC NLS PYMALLOC	55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC
56	OPTIONS_DEFAULT= LIBMPDEC PYMALLOC	56	OPTIONS_DEFAULT= LIBMPDEC LTO PYMALLOC
		57	OPTIONS_EXCLUDE_powerpc64= LTO
		58	OPTIONS_EXCLUDE_riscv64= LTO
57	OPTIONS_RADIO= HASH	59	OPTIONS_RADIO= HASH
58	OPTIONS_RADIO_HASH= FNV SIPHASH	60	OPTIONS_RADIO_HASH= FNV SIPHASH
59	OPTIONS_SUB= yes	61	OPTIONS_SUB= yes
Lines 75-80 IPV6_CONFIGURE_ENABLE= ipv6 Link Here
75	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec	77	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec
76	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal	78	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal
77		79
		80	LTO_CONFIGURE_ON= --with-lto
		81
78	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat	82	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
79	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3	83	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
80	# Upstream Issue: https://bugs.python.org/issue6299	84	# Upstream Issue: https://bugs.python.org/issue6299

Added Link Here

(-)b/lang/python38/files/patch-configure (+11 lines)
1	--- configure.orig 2022-02-23 19:52:00 UTC
2	+++ configure
3	@@ -6625,7 +6625,7 @@ fi
4
5	if test "$Py_LTO" = 'true' ; then
6	case $CC in
7	- clang)
8	+ clang\|cc)
9
10	if test -n "$ac_tool_prefix"; then
11	# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.

Lines 52-59 PLIST_SUB= ABI=${ABIFLAGS} \ Link Here

(-)b/lang/python39/Makefile (-2 / +6 lines)
52	XYZDOT=${DISTVERSION} \	52	XYZDOT=${DISTVERSION} \
53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	53	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
54		54
55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC NLS PYMALLOC	55	OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC
56	OPTIONS_DEFAULT= LIBMPDEC PYMALLOC	56	OPTIONS_DEFAULT= LIBMPDEC LTO PYMALLOC
		57	OPTIONS_EXCLUDE_powerpc64= LTO
		58	OPTIONS_EXCLUDE_riscv64= LTO
57	OPTIONS_RADIO= HASH	59	OPTIONS_RADIO= HASH
58	OPTIONS_RADIO_HASH= FNV SIPHASH	60	OPTIONS_RADIO_HASH= FNV SIPHASH
59	OPTIONS_SUB= yes	61	OPTIONS_SUB= yes
Lines 75-80 IPV6_CONFIGURE_ENABLE= ipv6 Link Here
75	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec	77	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec
76	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal	78	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal
77		79
		80	LTO_CONFIGURE_ON= --with-lto
		81
78	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat	82	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
79	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3	83	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
80	# Upstream Issue: https://bugs.python.org/issue6299	84	# Upstream Issue: https://bugs.python.org/issue6299

Added Link Here

(-)b/lang/python39/files/patch-configure (+11 lines)
1	--- configure.orig 2022-02-23 19:52:00 UTC
2	+++ configure
3	@@ -6625,7 +6625,7 @@ fi
4
5	if test "$Py_LTO" = 'true' ; then
6	case $CC in
7	- clang)
8	+ clang\|cc)
9
10	if test -n "$ac_tool_prefix"; then
11	# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.

Return to bug 261974