Commit 4c89be22 authored by Jérome Perrin's avatar Jérome Perrin

glib: configure with `$PYTHON` as python

This take another approach at c5cd4e06 (component/glib: set --with-python
to generate scripts with slapos python, 2022-09-20) because this python
might exceed the limit of shebang lines, that change was bad because it
brought back the problem that we fixed in 6acdc8ca (glib: put the expected
python in $PATH, 2019-12-18)

Now that component/defaults.cfg set the ${python:location}/bin in $PATH,
we can assume that python is always in $PATH. The problem with python3
software is that python3 does not install a "python" binary, only python3,
so we can use the $PYTHON environment variable which will be set to
python2 or python3 and that in both cases this will be a valid python
interpreter.

This re-applies 7581b668 (component/glib: remove bad file bin/gtester-report
after compilation, 2020-08-07) because with this approach that script's
shebang is just #!python3
parent 06088ccb
Pipeline #23846 failed with stage
...@@ -25,7 +25,7 @@ configure-options = ...@@ -25,7 +25,7 @@ configure-options =
--disable-fam --disable-fam
--disable-xattr --disable-xattr
--disable-man --disable-man
--with-python=${buildout:executable} --with-python=$PYTHON
environment = environment =
PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
...@@ -34,3 +34,4 @@ environment = ...@@ -34,3 +34,4 @@ environment =
LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
PCRE_CFLAGS=-I${pcre:location}/include PCRE_CFLAGS=-I${pcre:location}/include
PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
post-install = rm %(location)s/bin/gtester-report
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment