From 705fe2f2f871fcefb2bc2f244c509f04516ba3a2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 13 Jan 2010 22:58:21 +0000 Subject: glib-2.0: Convert to BBCLASSEXTEND Signed-off-by: Richard Purdie --- meta/packages/glib-2.0/files/glibconfig-sysdefs.h | 6 ----- .../glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h | 6 +++++ meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb | 29 ---------------------- meta/packages/glib-2.0/glib-2.0_2.22.3.bb | 6 ++++- meta/packages/glib-2.0/glib.inc | 4 +-- 5 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 meta/packages/glib-2.0/files/glibconfig-sysdefs.h create mode 100644 meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h delete mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb (limited to 'meta/packages') diff --git a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h b/meta/packages/glib-2.0/files/glibconfig-sysdefs.h deleted file mode 100644 index 1329e7f21c..0000000000 --- a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h +++ /dev/null @@ -1,6 +0,0 @@ -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h new file mode 100644 index 0000000000..1329e7f21c --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h @@ -0,0 +1,6 @@ +#define GLIB_SYSDEF_POLLIN =1 +#define GLIB_SYSDEF_POLLOUT =4 +#define GLIB_SYSDEF_POLLPRI =2 +#define GLIB_SYSDEF_POLLERR =8 +#define GLIB_SYSDEF_POLLHUP =16 +#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb deleted file mode 100644 index 661ad360c6..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "GLib is a general-purpose utility library, \ -which provides many useful data types, macros, \ -type conversions, string utilities, file utilities, a main \ -loop abstraction, and so on. It works on many \ -UNIX-like platforms, Windows, OS/2 and BeOS." -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS += "gtk-doc-native" -PR = "r1" - -SRC_URI = "http://download.gnome.org/sources/glib/2.22/glib-${PV}.tar.bz2 \ - file://glib-gettextize-dir.patch;patch=1 \ - file://configure-libtool.patch;patch=1 \ - file://glibconfig-sysdefs.h" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools_stage pkgconfig native gettext - -acpaths = "" -do_configure_prepend () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . -} - -do_install_append () { - install -d ${D}${includedir}/glib-2.0/glib - install -m 0755 ${S}/glibconfig.h ${D}${includedir}/glib-2.0/glibconfig.h -} diff --git a/meta/packages/glib-2.0/glib-2.0_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb index eae43de0ed..26d91a9cfa 100644 --- a/meta/packages/glib-2.0/glib-2.0_2.22.3.bb +++ b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb @@ -1,7 +1,11 @@ require glib.inc -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" + +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch;patch=1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/glib-2.0/glib.inc b/meta/packages/glib-2.0/glib.inc index c513df09d3..00f113f530 100644 --- a/meta/packages/glib-2.0/glib.inc +++ b/meta/packages/glib-2.0/glib.inc @@ -6,8 +6,8 @@ UNIX-like platforms, Windows, OS/2 and BeOS." LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" -DEPENDS += "glib-2.0-native gtk-doc-native gettext" -DEPENDS += "virtual/libiconv virtual/libintl" +DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl" +DEPENDS_virtclass-native = "gtk-doc-native" PACKAGES =+ "glib-2.0-utils " LEAD_SONAME = "libglib-2.0.*" -- cgit v1.2.3-54-g00ecf