summaryrefslogtreecommitdiff
path: root/glib-2.0
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-09 03:00:50 +0000
committerChris Larson <clarson@kergoth.com>2004-05-09 03:00:50 +0000
commit2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 (patch)
tree0c0e1e2663501f3d271fb082f8fee20eb3fd0f38 /glib-2.0
parentea4f4c02e9679dfb2978f3d9a9042f2f7ed0ec08 (diff)
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages 2004/05/08 23:00:41-04:00 local!kergoth Upgrade the alsa packages to 1.0.4. 2004/05/08 22:17:13-04:00 local!kergoth Fix compile error with adns, resulting from a function definition not matching the declaration. 2004/05/08 18:00:51-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:20-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:15-04:00 local!kergoth Fixing up the libtool-native/libtool-cross mess. 2004/05/08 13:59:04-04:00 local!kergoth Bugfix in ncurses usage of oe_libinstall. 2004/05/07 21:46:16-04:00 local!kergoth Merge 2004/05/07 21:45:26-04:00 local!kergoth Adapt some .oe's to use oe_libinstall. BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ
Diffstat (limited to 'glib-2.0')
-rw-r--r--glib-2.0/glib-2.0-native_2.2.3.oe18
-rw-r--r--glib-2.0/glib-2.0_2.2.3.oe17
2 files changed, 8 insertions, 27 deletions
diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe
index 6993a712d1..e3a38ad5f2 100644
--- a/glib-2.0/glib-2.0-native_2.2.3.oe
+++ b/glib-2.0/glib-2.0-native_2.2.3.oe
@@ -12,23 +12,13 @@ do_configure_prepend () {
install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h .
}
-SOV = "0.200.3"
-
do_stage () {
install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
install -m 0755 gobject/glib-genmarshal ${STAGING_BINDIR}/
- oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la
- install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a
- install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la
- install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a
- install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la
- install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a
- install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la
- install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a
+ oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/glib-2.0/glib
install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h
diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe
index 3f50f8cee7..99a9feeb24 100644
--- a/glib-2.0/glib-2.0_2.2.3.oe
+++ b/glib-2.0/glib-2.0_2.2.3.oe
@@ -20,20 +20,11 @@ do_configure_prepend () {
install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h .
}
-SOV = "0.200.3"
do_stage () {
- oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la
- #install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a
- install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la
- #install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a
- install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la
- #install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a
- install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la
- #install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a
+ oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/glib-2.0/glib
install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h