Page MenuHomeFreeBSD

Uses/python.mk: Fix PYTHON_REL for pre-release versions
ClosedPublic

Authored by koobs on Sep 14 2015, 7:40 AM.

Details

Summary
Uses/python.mk: Fix PYTHON_REL for pre-release versions

Modify the PYTHON_REL variable assignment in python.mk so that it
can support PORTVERSION's that have non-integer suffixes such as
the current lang/python35 version (PORTVERSION currently 3.5.0.r3).

Currently, ports that use PYTHON_REL while DEFAULT_VERSIONS is set to
3.5, fail to build with the following make error:

make: "/usr/ports/Mk/Uses/python.mk" line 503:
warning: String comparison operator should be either == or !=
make: "/usr/ports/Mk/Uses/python.mk" line 503:
Malformed conditional (${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST))

This is caused by a non-integer value ("r3") in PYTHON_REL.

While I'm here, add a comment block to be clear on what we
want (currently) to achieve.

PR:		203093
Test Plan
  • Checked PYTHON_REL value for all python versions 2.7 through 3.5 for correctness.
  • Test py- ports with DEFAULT_VERSIONS=python=3.5 set

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

koobs updated this revision to Diff 8738.Sep 14 2015, 7:40 AM
koobs retitled this revision from to Uses/python.mk: Fix PYTHON_REL for pre-release versions.
koobs updated this object.
koobs edited the test plan for this revision. (Show Details)
koobs added a reviewer: antoine.
koobs updated this object.Sep 14 2015, 7:41 AM
koobs edited edge metadata.
antoine accepted this revision.Sep 14 2015, 7:57 AM
antoine edited edge metadata.
This revision is now accepted and ready to land.Sep 14 2015, 7:57 AM
This revision was automatically updated to reflect the committed changes.