diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2021-05-27 18:48:40 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-06-03 18:14:06 -0700 |
| commit | 93d66a204ba9bbbdbaac6acaa5da3185d583b9c5 (patch) | |
| tree | adb1972acb6a20f2f71274b189122d2d67a3d03d /dev-libs/glib | |
| parent | dev-libs/atk: Switch to meson-multilib (diff) | |
| download | gentoo-93d66a204ba9bbbdbaac6acaa5da3185d583b9c5.tar.gz gentoo-93d66a204ba9bbbdbaac6acaa5da3185d583b9c5.tar.bz2 gentoo-93d66a204ba9bbbdbaac6acaa5da3185d583b9c5.zip | |
dev-libs/glib: Switch to meson-multilib
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/glib-2.66.8.ebuild | 8 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.68.2.ebuild | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/dev-libs/glib/glib-2.66.8.ebuild b/dev-libs/glib/glib-2.66.8.ebuild index 63721f718da6..ad8bfc3dd7cf 100644 --- a/dev-libs/glib/glib-2.66.8.ebuild +++ b/dev-libs/glib/glib-2.66.8.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" @@ -170,7 +170,7 @@ multilib_src_configure() { $(meson_use systemtap dtrace) $(meson_use systemtap) $(meson_feature sysprof) - -Dgtk_doc=$(multilib_native_usex gtk-doc true false) + $(meson_native_use_bool gtk-doc gtk_doc) $(meson_use fam) -Dinstalled_tests=false -Dnls=enabled @@ -179,10 +179,6 @@ multilib_src_configure() { meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { export XDG_CONFIG_DIRS=/etc/xdg export XDG_DATA_DIRS=/usr/local/share:/usr/share diff --git a/dev-libs/glib/glib-2.68.2.ebuild b/dev-libs/glib/glib-2.68.2.ebuild index c43b9d12caae..26d2f4db3de1 100644 --- a/dev-libs/glib/glib-2.68.2.ebuild +++ b/dev-libs/glib/glib-2.68.2.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" @@ -166,21 +166,17 @@ multilib_src_configure() { $(meson_use systemtap dtrace) $(meson_use systemtap) $(meson_feature sysprof) - -Dgtk_doc=$(multilib_native_usex gtk-doc true false) + $(meson_native_use_bool gtk-doc gtk_doc) $(meson_use fam) $(meson_use test tests) -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled - -Dlibelf=$(multilib_native_usex elf enabled disabled) + $(meson_native_use_feature elf libelf) ) meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { export XDG_CONFIG_DIRS=/etc/xdg export XDG_DATA_DIRS=/usr/local/share:/usr/share @@ -202,8 +198,6 @@ multilib_src_install() { } multilib_src_install_all() { - einstalldocs - # These are installed by dev-util/glib-utils # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson rm "${ED}/usr/bin/glib-genmarshal" || die |