diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-07-12 21:27:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-12 21:27:34 +0000 |
| commit | 4c83778e31aaaa2c9c70872795aaef94e3fa5872 (patch) | |
| tree | d549a7646b800cb3e1fe451f8236358f412c2dfe /packages/glib-2.0 | |
| parent | 6c017b0bdef75540ef6aa5d89be70928d9265e73 (diff) | |
| parent | de96a1c7650363b4146a3926def0d182239834b3 (diff) | |
merge of 11d8497b1833de1683f037417535cc4ba64608f3
and 85921202b8fd4be54741cadc9cbf9c3768a9b23a
Diffstat (limited to 'packages/glib-2.0')
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.10.1.bb | 50 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.8.6.bb (renamed from packages/glib-2.0/glib-2.0_2.10.2.bb) | 6 |
2 files changed, 3 insertions, 53 deletions
diff --git a/packages/glib-2.0/glib-2.0_2.10.1.bb b/packages/glib-2.0/glib-2.0_2.10.1.bb deleted file mode 100644 index 1f47883ef9..0000000000 --- a/packages/glib-2.0/glib-2.0_2.10.1.bb +++ /dev/null @@ -1,50 +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 += "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" - -DEFAULT_PREFERENCE="-1" - -SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -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 -} diff --git a/packages/glib-2.0/glib-2.0_2.10.2.bb b/packages/glib-2.0/glib-2.0_2.8.6.bb index 783c704674..eea05316b1 100644 --- a/packages/glib-2.0/glib-2.0_2.10.2.bb +++ b/packages/glib-2.0/glib-2.0_2.8.6.bb @@ -11,14 +11,14 @@ DEPENDS += "virtual/libiconv virtual/libintl" PACKAGES =+ "glib-2.0-utils " PR = "r1" -DEFAULT_PREFERENCE = "-100" - LEAD_SONAME = "libglib-2.0.*" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext" FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/glib-${PV}.tar.bz2 \ +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" |