PR#13: Regenerate generated files with python3 - rpms/python38

rpms / python38

#13 Regenerate generated files with python3

Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.

rpms/ churchyard/python38 regenerate into master

Regenerate generated files with python3

Miro Hrončok • 4 years ago

7e0c125

python38.spec

file modified

+11 -1

		`@@ -203,6 +203,10 @@`
		`BuildRequires: python-pip-wheel`
		`%endif`

		`+ %if %{without bootstrap}`
		`+ # for make regen-all`
		`+ BuildRequires: python3`
		`+ %endif`

		`# =======================`
		`# Source code and patches`
		`@@ -632,8 +636,14 @@`
		`$ExtraConfigArgs \`
		`%{nil}`

		`+ %if %{without bootstrap}`
		`+ # Regenerate generated files (needs python3)`
		`+ %make_build regen-all PYTHON_FOR_REGEN="python3"`
cstratak commented 4 years ago Wouldn't it be safer to hardcode /usr/bin/python3 here?
churchyard commented 4 years ago I don't think so. `/usr/bin/python3` is the only Python in `$PATH`.
		`+ %endif`
		`+`
		`+`
		`# Invoke the build`
		`- make EXTRA_CFLAGS="$CFLAGS $MoreCFlags" %{?_smp_mflags}`
		`+ %make_build EXTRA_CFLAGS="$CFLAGS $MoreCFlags"`

		`popd`
		`echo FINISHED: BUILD OF PYTHON FOR CONFIGURATION: $ConfName`

churchyard commented 4 years ago

Switch to %make_build when touching this

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1377240

churchyard commented on line 19 of python38.spec 4 years ago

Now this gave me a hard time. We run configure from within sub-sub-folder and regular python3 (the default) dies with ModuleNotFoundError Parser.pgen. The Parser directory is present in $(pwd), but it is empty at this point. I have no idea if this is just supposed to work out of the box, or if this approach with PYTHONPATH inside PYTHON_FOR_REGEN is actually desired.

churchyard commented 4 years ago

https://github.com/python/cpython/blob/d7befad328ad1a6d1f812be2bf154c1cd1e01fbc/Makefile.pre.in#L794

I think this would better work as:

- $(PYTHON_FOR_REGEN) -m Parser.pgen $(srcdir)/Grammar/Grammar \
+ PYTHONPATH=$(srcdir) $(PYTHON_FOR_REGEN) -m Parser.pgen $(srcdir)/Grammar/Grammar \

@vstinner should I submit a CPython bug, or am I just trying to do the unsupported?