Merge oe-devel@oe-devel.bkbits.net:openembedded

into handhelds.org:/home/kergoth/code/openembedded

2004/12/15 18:25:33-06:00 ti.com!kergoth
Use gcc visibility bits when available in glib-2.0 2.4.6.

BKrev: 41c0d5feKOB0mhFQJ4RZtD0v5GQKTg

diff --git a/packages/glib-2.0/files/visibility.patch b/packages/glib-2.0/files/visibility.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/glib-2.0/glib-2.0-native_2.4.6.bb b/packages/glib-2.0/glib-2.0-native_2.4.6.bb
index e69de29..88891dd 100644 (file)
--- a/packages/glib-2.0/glib-2.0-native_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.4.6.bb
@@ -0,0 +1,49 @@
+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 = "GPLv2"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk-doc-native"
+PR = "r5"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
+           file://visibility.patch;patch=1 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig native gettext
+
+acpaths = ""
+do_configure_prepend () {
+       install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+       install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
+       install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
+       install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
+       install -d ${STAGING_INCDIR}/glib-2.0/glib
+       install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+       install -d ${STAGING_DATADIR}/aclocal
+       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+       install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+       install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+       install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
+}
+
+do_install () {
+       :
+}

diff --git a/packages/glib-2.0/glib-2.0_2.4.6.bb b/packages/glib-2.0/glib-2.0_2.4.6.bb
index e69de29..c5365f3 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.6.bb
@@ -0,0 +1,50 @@
+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 = "GPLv2"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r2"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
+           file://glibinclude.patch;patch=1;pnum=2 \
+           file://visibility.patch;patch=1 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+       if bb.data.getVar("USE_NLS", d, 1) == "no":
+               raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+       install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
+       install -d ${STAGING_INCDIR}/glib-2.0/glib
+       install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+       install -d ${STAGING_DATADIR}/aclocal
+       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}