Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177727869
D3662.1795142970.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
847 B
Referenced Files
None
Subscribers
None
D3662.1795142970.diff
View Options
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -383,7 +383,11 @@
PYTHON_ABIVER= # empty
PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR}
-PYTHON_REL= ${PYTHON_PORTVERSION:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g}
+# Create a 4 integer version string, prefixing 0 to the last token if
+# it's a single character. Only use the the first 3 tokens of
+# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
+# any Python port (lang/pythonXY)
+PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g}
# Might be overridden by calling ports
PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 2:49 AM (2 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41858005
Default Alt Text
D3662.1795142970.diff (847 B)
Attached To
Mode
D3662: Uses/python.mk: Fix PYTHON_REL for pre-release versions
Attached
Detach File
Event Timeline