Commit 0d6674bb authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

component/slapos: fix the OBS compilation

We need LD_LIBRARY_PATH only during OBS compilation (since the rpath is
not correctly set during compilation because it already points to final
/opt/slapos path).

This is a fixup of 61c13f54.
parent 49ba9e46
...@@ -88,7 +88,6 @@ environment = ...@@ -88,7 +88,6 @@ environment =
PATH=${pkgconfig:location}/bin:${glib:location}/bin:${ninja:location}/bin:${meson:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${glib:location}/bin:${ninja:location}/bin:${meson:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${glib:location}/lib LDFLAGS=-Wl,-rpath=${:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${glib:location}/lib
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre2:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre2:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
LD_LIBRARY_PATH=${glib:location}/lib
[pygobject3] [pygobject3]
...@@ -110,7 +109,6 @@ make-binary = ${ninja:location}/bin/ninja -C builddir ...@@ -110,7 +109,6 @@ make-binary = ${ninja:location}/bin/ninja -C builddir
environment = environment =
PATH=${pkgconfig:location}/bin:${ninja:location}/bin:${libtool:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${ninja:location}/bin:${libtool:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${gobject-introspection:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${gobject-introspection:location}/lib/pkgconfig
LD_LIBRARY_PATH=${glib:location}/lib:${libffi:location}/lib
PYTHON=${buildout:executable} PYTHON=${buildout:executable}
[trusted-config] [trusted-config]
......
...@@ -104,12 +104,16 @@ pre-configure += ...@@ -104,12 +104,16 @@ pre-configure +=
sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
environment += environment +=
PERL5LIB=${perl:location}/lib/${perl:version}/ PERL5LIB=${perl:location}/lib/${perl:version}/
BISON_PKGDATADIR=${bison:location}/share/bison/
LD_LIBRARY_PATH=${glib:location}/lib
post-install = post-install =
sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
[pygobject3] [pygobject3]
pre-configure += pre-configure +=
sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
environment +=
LD_LIBRARY_PATH=${glib:location}/lib:${libffi:location}/lib:${gobject-introspection:location}/lib
post-install = post-install =
sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
......
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