aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-16 23:27:31 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-16 23:27:31 +0000
commit94577a77cee21f5944434e3a958f4d3827241174 (patch)
tree70fa8bed5302f6a1478db9b43cf6af955e0fb8f2 /meta
parent6349b2b0723eaab550776694995c3aeab3d0271a (diff)
downloadopenembedded-core-contrib-94577a77cee21f5944434e3a958f4d3827241174.tar.gz
glib-2.0: Clean up staging functions and convert to do_install
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb34
-rw-r--r--meta/packages/glib-2.0/glib.inc9
2 files changed, 8 insertions, 35 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb b/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb
index 68626d90f27..83d80b40f41 100644
--- a/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb
@@ -16,40 +16,14 @@ SRC_URI = "http://download.gnome.org/sources/glib/2.20/glib-${PV}.tar.bz2 \
S = "${WORKDIR}/glib-${PV}"
-inherit autotools pkgconfig native gettext
+inherit autotools_stage 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}
- oe_libinstall -so -C gio libgio-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/
- install -d ${STAGING_LIBDIR}/pkgconfig/
- for i in glib-2.0 gmodule-2.0 gmodule-export-2.0 gmodule-no-export-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0; do
- install -m 0644 $i.pc ${STAGING_LIBDIR}/pkgconfig/
- done
-
-
-}
-
-do_install () {
- :
+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.inc b/meta/packages/glib-2.0/glib.inc
index 78f36c034fc..389233caeb6 100644
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/packages/glib-2.0/glib.inc
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--enable-included-printf=no"
S = "${WORKDIR}/glib-${PV}"
-inherit autotools pkgconfig gettext
+inherit autotools_stage pkgconfig gettext
require glib-2.0.inc
@@ -26,10 +26,9 @@ do_configure_prepend () {
install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
}
-do_stage () {
- autotools_stage_all
- install -d ${STAGING_INCDIR}/glib-2.0/glib
- install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.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
}
FILES_${PN} = "${libdir}/lib*${SOLIBS}"