On 04.11.2020 18:19, Elliott Mitchell wrote: > On Wed, Nov 04, 2020 at 03:57:49PM +0100, Jan Beulich wrote: >> --- a/tools/python/Makefile >> +++ b/tools/python/Makefile >> @@ -8,19 +8,21 @@ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS) >> PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS) >> INSTALL_LOG = build/installed_files.txt >> >> +setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" >> LDFLAGS="$(PY_LDFLAGS)" \ >> + SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \ >> + SHLIB_libxenguest="$(SHLIB_libxenguest)" \ >> + SHLIB_libxenstore="$(SHLIB_libxenstore)" \ >> + $(PYTHON) setup.py >> + >> .PHONY: build >> build: >> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" >> LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build >> + $(setup.py) build >> >> .PHONY: install >> install: >> $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) >> - >> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \ >> - LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \ >> - --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ >> + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ >> --root="$(DESTDIR)" --force >> - >> $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream >> $(DESTDIR)$(LIBEXEC_BIN) >> $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) > > Shouldn't similar work of moving all the environment variable settings to > a $(setup.py) variable be done for tools/pygrub/Makefile? > > tools/python/Makefile and tools/pygrub/Makefile are presently quite > similar and keeping them similar seems a Good Idea(tm).
The only dependency there is libfsimage - I don't even know whether the same approach can be used there. If it can, I'd say: Likely, but I've not observed a similar problem with pygrub, and it's only the build problem I'm after here, sorry. As said in the post-commit- message remark, I think there's more consolidation to be done here, too, and I think it's at that point when pygrub, as applicable, should also be brought in sync. Jan
