From c3ae7abd667bb78fd9fb29a88657b2d4ec15a142 Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 22 Jan 2014 12:34:22 +0000 Subject: add dbus-glib, glib2 and libffi linux module support --- emulators/suse121_linux/emulator.mk | 5 ++++- emulators/suse131_linux/emulator.mk | 5 ++++- mk/emulator/linux.mk | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/emulators/suse121_linux/emulator.mk b/emulators/suse121_linux/emulator.mk index 18ccbeae41b..22165f7fca1 100644 --- a/emulators/suse121_linux/emulator.mk +++ b/emulators/suse121_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.3 2013/12/12 11:03:17 obache Exp $ +# $NetBSD: emulator.mk,v 1.4 2014/01/22 12:34:22 obache Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -53,3 +53,6 @@ DEPENDS_suse-12.1.${_mod_}:= \ .endif DEPENDS_suse-12.1.nss= ${DEPENDS_suse-12.1.base} DEPENDS_suse-12.1.nspr= ${DEPENDS_suse-12.1.base} +DEPENDS_suse-12.1.dbus-glib= ${DEPENDS_suse-12.1.gtk2} +DEPENDS_suse-12.1.libffi= ${DEPENDS_suse-12.1.gtk2} +DEPENDS_suse-12.1.glib2= ${DEPENDS_suse-12.1.gtk2} diff --git a/emulators/suse131_linux/emulator.mk b/emulators/suse131_linux/emulator.mk index 589551928eb..a212d7d0dd4 100644 --- a/emulators/suse131_linux/emulator.mk +++ b/emulators/suse131_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.2 2013/12/12 02:34:28 obache Exp $ +# $NetBSD: emulator.mk,v 1.3 2014/01/22 12:34:22 obache Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -29,6 +29,8 @@ DEPENDS_suse-13.1.curl?= suse_libcurl${_SUSE_VERSION_REQD}:../../emulators/suse1 DEPENDS_suse-13.1.cyrus-sasl?= suse_cyrus-sasl${_SUSE_VERSION_REQD}:../../emulators/suse131_cyrus-sasl DEPENDS_suse-13.1.drm?= suse_libdrm${_SUSE_VERSION_REQD}:../../emulators/suse131_libdrm DEPENDS_suse-13.1.dbus?= suse_libdbus${_SUSE_VERSION_REQD}:../../emulators/suse131_libdbus +DEPENDS_suse-13.1.dbus-glib?= suse_dbus-glib${_SUSE_VERSION_REQD}:../../emulators/suse131_dbus-glib +DEPENDS_suse-13.1.glib2?= suse_glib2${_SUSE_VERSION_REQD}:../../emulators/suse131_glib2 DEPENDS_suse-13.1.expat?= suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse131_expat DEPENDS_suse-13.1.fontconfig?= suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse131_fontconfig DEPENDS_suse-13.1.freetype2?= suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse131_freetype2 @@ -36,6 +38,7 @@ DEPENDS_suse-13.1.glx?= suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse131_g DEPENDS_suse-13.1.gtk2?= suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse131_gtk2 DEPENDS_suse-13.1.jpeg?= suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse131_libjpeg DEPENDS_suse-13.1.krb5?= suse_krb5${_SUSE_VERSION_REQD}:../../emulators/suse131_krb5 +DEPENDS_suse-13.1.libffi?= suse_libffi${_SUSE_VERSION_REQD}:../../emulators/suse131_libffi DEPENDS_suse-13.1.libidn?= suse_libidn${_SUSE_VERSION_REQD}:../../emulators/suse131_libidn DEPENDS_suse-13.1.libjson?= suse_libjson${_SUSE_VERSION_REQD}:../../emulators/suse131_libjson DEPENDS_suse-13.1.libsigc++2?= suse_libsigc++2${_SUSE_VERSION_REQD}:../../emulators/suse131_libsigc++2 diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk index 5c0d6738b48..f84afb1b420 100644 --- a/mk/emulator/linux.mk +++ b/mk/emulator/linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux.mk,v 1.22 2013/12/12 02:34:28 obache Exp $ +# $NetBSD: linux.mk,v 1.23 2014/01/22 12:34:22 obache Exp $ # # Linux binary emulation framework # @@ -66,13 +66,16 @@ _EMUL_MODULES+= curl _EMUL_MODULES+= cyrus-sasl _EMUL_MODULES+= drm _EMUL_MODULES+= dbus +_EMUL_MODULES+= dbus-glib _EMUL_MODULES+= expat _EMUL_MODULES+= fontconfig _EMUL_MODULES+= freetype2 +_EMUL_MODULES+= glib2 _EMUL_MODULES+= glx _EMUL_MODULES+= gtk2 _EMUL_MODULES+= jpeg _EMUL_MODULES+= krb5 +_EMUL_MODULES+= libffi _EMUL_MODULES+= libjson _EMUL_MODULES+= libsigc++2 _EMUL_MODULES+= libsndfile -- cgit v1.2.3