diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-22 18:17:27 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-22 18:17:27 +0200 |
| commit | 61743ca8888153cacbff24317c55125e775ebe80 (patch) | |
| tree | 0c8948c601df20eae04864f3c7a230b98ca65c19 /meta-oe/recipes-core/glib-2.0 | |
| parent | c6c282daa0cfd6459a31a001c53e724f54c89d9d (diff) | |
| download | meta-openembedded-61743ca8888153cacbff24317c55125e775ebe80.tar.gz | |
glib-2.0: sync with OE-core
remove 2.28.1 and merge in packaging changes
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core/glib-2.0')
| -rw-r--r-- | meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 25 | ||||
| -rw-r--r-- | meta-oe/recipes-core/glib-2.0/glib.inc | 7 |
2 files changed, 4 insertions, 28 deletions
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb deleted file mode 100644 index 7f7f59ebc8..0000000000 --- a/meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb +++ /dev/null @@ -1,25 +0,0 @@ -require glib.inc - -PR = "r1" -PE = "1" - -SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \ - file://configure-libtool.patch \ - file://60_wait-longer-for-threads-to-die.patch \ - file://g_once_init_enter.patch \ - file://0003-gatomic-proper-pointer-get-cast.patch.patch \ - file://0005-glib-mkenums-interpreter.patch.patch \ - " -# Only apply this patch for target recipe on uclibc -SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" - -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" - -SRC_URI[md5sum] = "789e7520f71c6a4bf08bc683ec764d24" -SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f" - -BBCLASSEXTEND = "native" - -FILES_${PN} += "${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" -FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" - diff --git a/meta-oe/recipes-core/glib-2.0/glib.inc b/meta-oe/recipes-core/glib-2.0/glib.inc index 9eafbd89d7..0800c85c4a 100644 --- a/meta-oe/recipes-core/glib-2.0/glib.inc +++ b/meta-oe/recipes-core/glib-2.0/glib.inc @@ -2,7 +2,7 @@ SUMMARY = "A general-purpose utility library" 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." # pcre is under BSD; # docs/reference/COPYING is with a 'public domai'-like license! -LICENSE = "LGPLv2+ & BSD & public domain" +LICENSE = "LGPLv2+ & BSD & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://glib/glib.h;startline=4;endline=17;md5=a4332fe58b076f29d07c9c066d2967b6 \ file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ @@ -31,7 +31,8 @@ EXTRA_OECONF = "--disable-debug --enable-included-printf=no" EXTRA_OECONF_virtclass-native = "" EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/glib-2.0/include ${libdir}/gdbus-codegen/*.py" +FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" +FILES_${PN}-dev += "${libdir}/glib-2.0/include" +FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" ARM_INSTRUCTION_SET = "arm" |