Commit 61c13f54 authored by Boxiang Sun's avatar Boxiang Sun Committed by Thomas Gambier

component/firewalld: Migrate two packages to Meson build system

- Upgraded gobject-introspection to version 1.76.1:
  - Switched build system from autotools to Meson.
  - Updated pre-configure and environment variables to support Meson.
  - Removed outdated configure flags.

- Upgraded pygobject to version 3.44.2:
  - Switched build system from autotools to Meson.
  - Updated pre-configure to handle Meson subprojects.
  - Explicitly disabled cairo bindings with .
  - Updated environment variables for Meson compatibility.
parent 0956f91c
...@@ -3,6 +3,7 @@ parts = ...@@ -3,6 +3,7 @@ parts =
firewalld-patch firewalld-patch
extends = extends =
../bison/buildout.cfg
../defaults.cfg ../defaults.cfg
../dbus/buildout.cfg ../dbus/buildout.cfg
../flex/buildout.cfg ../flex/buildout.cfg
...@@ -11,7 +12,11 @@ extends = ...@@ -11,7 +12,11 @@ extends =
../intltool/buildout.cfg ../intltool/buildout.cfg
../libtool/buildout.cfg ../libtool/buildout.cfg
../nftables/buildout.cfg ../nftables/buildout.cfg
../pcre2/buildout.cfg
../python-slip/buildout.cfg ../python-slip/buildout.cfg
../meson/buildout.cfg
../ninja/buildout.cfg
../pkgconfig/buildout.cfg
[firewalld] [firewalld]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -66,46 +71,45 @@ environment = ...@@ -66,46 +71,45 @@ environment =
[gobject-introspection] [gobject-introspection]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gobject-introspection-1.50.0.tar.xz url = https://download.gnome.org/core/44/44.9/sources/gobject-introspection-1.76.1.tar.xz
md5sum = 5af8d724f25d0c9cfbe6df41b77e5dc0 md5sum = 5cb554fdd139db79f9b1be13892fddac
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/ configure-command = true # Disable configure, use meson, required by 1.70+
configure-options = pre-configure =
--disable-static mkdir -p subprojects/gnu-config
cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess subprojects/gnu-config/
configure-command =
${meson:location}/bin/meson setup builddir \
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} \
--wrap-mode=nodownload \
-Dbuildtype=release
make-binary = ${ninja:location}/bin/ninja -C builddir
environment = environment =
PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils: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
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends} PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre2:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include LD_LIBRARY_PATH=${glib:location}/lib
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi -L${zlib:location}/lib/ -Wl,-rpath=${zlib:location}/lib/
GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lgobject-2.0
FFI_CFLAGS=-I${libffi:location}/include
FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
GIR_DIR=${buildout:parts-directory}/${:_buildout_section_name_}/share/gir-1.0
PYTHON=${buildout:executable}
[pygobject3] [pygobject3]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pygobject-3.22.0.tar.xz url = https://download.gnome.org/core/44/44.9/sources/pygobject-3.44.2.tar.xz
python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
md5sum = ed4117ed5d554d25fd7718807fbf819f md5sum = f1a1e2304c328094806c306bbf658e85
configure-command = true # Disable configure, use meson
pre-configure = pre-configure =
cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess . mkdir -p subprojects/gnu-config
sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess subprojects/gnu-config/
configure-options = configure-command =
--disable-static ${meson:location}/bin/meson setup builddir \
--disable-cairo --prefix=${buildout:parts-directory}/${:_buildout_section_name_} \
--wrap-mode=nodownload \
-Dpython=${buildout:executable} \
-Dbuildtype=release \
-Dpycairo=disabled # Disable cairo bindings explicitly
make-binary = ${ninja:location}/bin/ninja -C builddir
environment = environment =
PATH=${pkgconfig: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/x86_64-linux-gnu/pkgconfig
FFI_CFLAGS=-I${libffi:location}/include LD_LIBRARY_PATH=${glib:location}/lib:${libffi:location}/lib
FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gettext:location}/include -I${libffi:location}/include
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
GIO_LIBS=-L${glib:location}/lib -lgio-2.0
GI_CFLAGS=-I${gobject-introspection:location}/include/gobject-introspection-1.0
GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
PYTHON=${buildout:executable} PYTHON=${buildout:executable}
[trusted-config] [trusted-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