Commit 49ba9e46 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

component/firewalld: fix library path

We must force meson to output the lib in a constant directory. Also fix
runtime libraries

This is a fixup of 61c13f54.
parent ccdc76bb
...@@ -73,6 +73,7 @@ environment = ...@@ -73,6 +73,7 @@ environment =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://download.gnome.org/core/44/44.9/sources/gobject-introspection-1.76.1.tar.xz url = https://download.gnome.org/core/44/44.9/sources/gobject-introspection-1.76.1.tar.xz
md5sum = 5cb554fdd139db79f9b1be13892fddac md5sum = 5cb554fdd139db79f9b1be13892fddac
location = @@LOCATION@@
pre-configure = pre-configure =
mkdir -p subprojects/gnu-config mkdir -p subprojects/gnu-config
cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess subprojects/gnu-config/ cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess subprojects/gnu-config/
...@@ -80,10 +81,12 @@ configure-command = ...@@ -80,10 +81,12 @@ configure-command =
${meson:location}/bin/meson setup builddir \ ${meson:location}/bin/meson setup builddir \
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} \ --prefix=${buildout:parts-directory}/${:_buildout_section_name_} \
--wrap-mode=nodownload \ --wrap-mode=nodownload \
--libdir=lib \
-Dbuildtype=release -Dbuildtype=release
make-binary = ${ninja:location}/bin/ninja -C builddir make-binary = ${ninja:location}/bin/ninja -C builddir
environment = 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
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 LD_LIBRARY_PATH=${glib:location}/lib
...@@ -106,7 +109,7 @@ configure-command = ...@@ -106,7 +109,7 @@ configure-command =
make-binary = ${ninja:location}/bin/ninja -C builddir 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/x86_64-linux-gnu/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 LD_LIBRARY_PATH=${glib:location}/lib:${libffi:location}/lib
PYTHON=${buildout:executable} PYTHON=${buildout:executable}
......
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