From da4dfa8b6fb0750c8013cf05209e3aeedaccee66 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Sep 2009 00:14:16 +0200 Subject: glib-2.0: update 2.21 series to 2.21.6 --- conf/checksums.ini | 4 +++ .../glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch | 42 ---------------------- .../glib-2.0-2.21.4/configure-libtool.patch | 34 ------------------ .../glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch | 42 ++++++++++++++++++++++ .../glib-2.0-2.21.6/configure-libtool.patch | 34 ++++++++++++++++++ recipes/glib-2.0/glib-2.0-native_2.21.4.bb | 40 --------------------- recipes/glib-2.0/glib-2.0-native_2.21.6.bb | 40 +++++++++++++++++++++ recipes/glib-2.0/glib-2.0_2.21.4.bb | 12 ------- recipes/glib-2.0/glib-2.0_2.21.6.bb | 12 +++++++ 9 files changed, 132 insertions(+), 128 deletions(-) delete mode 100644 recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch delete mode 100644 recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch delete mode 100644 recipes/glib-2.0/glib-2.0-native_2.21.4.bb create mode 100644 recipes/glib-2.0/glib-2.0-native_2.21.6.bb delete mode 100644 recipes/glib-2.0/glib-2.0_2.21.4.bb create mode 100644 recipes/glib-2.0/glib-2.0_2.21.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 9b76d1df66..15ed835cf0 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8194,6 +8194,10 @@ sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9 md5=5092c5b479ba80065dc164d27e63000f sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d +[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.6.tar.bz2] +md5=3b0452fbd877db53dafabdc074600cb8 +sha256=8b4750523a07102c90c7eecf1743f852ce2aadcb7a43284a9e06baf70beb9b8a + [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2] md5=a45db7d82480da431f6cd00ea041a534 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2 diff --git a/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch deleted file mode 100644 index d7aa08821f..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch +++ /dev/null @@ -1,42 +0,0 @@ -# gatomic.c uses SWP, which doesn't work in Thumb mode. -# Put that source file into a separate convenience library which is always built as ARM. - -Index: glib-2.18.1/glib/Makefile.am -=================================================================== ---- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 -+++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 -@@ -80,6 +80,7 @@ - galiasdef.c - - lib_LTLIBRARIES = libglib-2.0.la -+noinst_LTLIBRARIES = libgatomic.la - - if OS_WIN32_AND_DLL_COMPILATION - if MS_LIB_AVAILABLE -@@ -96,10 +97,14 @@ - uninstall-ms-lib: - $(uninstall_ms_lib_cmd) - -+libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb -+ -+libgatomic_la_SOURCES = \ -+ gatomic.c -+ - libglib_2_0_la_SOURCES = \ - garray.c \ - gasyncqueue.c \ -- gatomic.c \ - gbacktrace.c \ - gbase64.c \ - gbookmarkfile.c \ -@@ -286,8 +291,8 @@ - pcre_inc = - endif - --libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) --libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) -+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la -+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la - - libglib_2_0_la_LDFLAGS = \ - $(glib_win32_res_ldflag) \ diff --git a/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch +++ /dev/null @@ -1,34 +0,0 @@ -# Poky renames libtool to $host_alias-libtool. -# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 -# so we can't call # it at this point. We can safely assume a version is available -# from PATH though - ---- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 -+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 -@@ -1174,7 +1174,7 @@ - G_MODULE_LDFLAGS= - else - export SED -- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - fi - dnl G_MODULE_IMPL= don't reset, so cmd-line can override - G_MODULE_NEED_USCORE=0 -@@ -1265,7 +1265,7 @@ - LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" - dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness - echo "void glib_plugin_test(void) { }" > plugin.c -- ${SHELL} ./libtool --mode=compile ${CC} -shared \ -+ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ - -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], - glib_cv_rtldglobal_broken,[ -@@ -1339,7 +1339,7 @@ - - AC_MSG_CHECKING(for the suffix of shared libraries) - export SED --shrext_cmds=`./libtool --config | grep '^shrext_cmds='` -+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` - eval $shrext_cmds - module=yes eval std_shrext=$shrext_cmds - # chop the initial dot diff --git a/recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch new file mode 100644 index 0000000000..d7aa08821f --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch @@ -0,0 +1,42 @@ +# gatomic.c uses SWP, which doesn't work in Thumb mode. +# Put that source file into a separate convenience library which is always built as ARM. + +Index: glib-2.18.1/glib/Makefile.am +=================================================================== +--- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 ++++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 +@@ -80,6 +80,7 @@ + galiasdef.c + + lib_LTLIBRARIES = libglib-2.0.la ++noinst_LTLIBRARIES = libgatomic.la + + if OS_WIN32_AND_DLL_COMPILATION + if MS_LIB_AVAILABLE +@@ -96,10 +97,14 @@ + uninstall-ms-lib: + $(uninstall_ms_lib_cmd) + ++libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb ++ ++libgatomic_la_SOURCES = \ ++ gatomic.c ++ + libglib_2_0_la_SOURCES = \ + garray.c \ + gasyncqueue.c \ +- gatomic.c \ + gbacktrace.c \ + gbase64.c \ + gbookmarkfile.c \ +@@ -286,8 +291,8 @@ + pcre_inc = + endif + +-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) +-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) ++libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la ++libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la + + libglib_2_0_la_LDFLAGS = \ + $(glib_win32_res_ldflag) \ diff --git a/recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch @@ -0,0 +1,34 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though + +--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 ++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1265,7 +1265,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1339,7 +1339,7 @@ + + AC_MSG_CHECKING(for the suffix of shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/recipes/glib-2.0/glib-2.0-native_2.21.4.bb b/recipes/glib-2.0/glib-2.0-native_2.21.4.bb deleted file mode 100644 index b5ce9da849..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.21.4.bb +++ /dev/null @@ -1,40 +0,0 @@ -require glib-2.0_${PV}.bb - -FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files" -DEPENDS = "gettext-native gtk-doc-native" -EXTRA_OECONF = "" - -inherit native - -do_configure_prepend() { - if [ -e ${S}/${TARGET_SYS}-libtool ] ; then - echo "${TARGET_SYS}-libtool already present" - else - cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S} - fi - -} - -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/ -} - -do_install () { - : -} diff --git a/recipes/glib-2.0/glib-2.0-native_2.21.6.bb b/recipes/glib-2.0/glib-2.0-native_2.21.6.bb new file mode 100644 index 0000000000..b5ce9da849 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-native_2.21.6.bb @@ -0,0 +1,40 @@ +require glib-2.0_${PV}.bb + +FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files" +DEPENDS = "gettext-native gtk-doc-native" +EXTRA_OECONF = "" + +inherit native + +do_configure_prepend() { + if [ -e ${S}/${TARGET_SYS}-libtool ] ; then + echo "${TARGET_SYS}-libtool already present" + else + cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S} + fi + +} + +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/ +} + +do_install () { + : +} diff --git a/recipes/glib-2.0/glib-2.0_2.21.4.bb b/recipes/glib-2.0/glib-2.0_2.21.4.bb deleted file mode 100644 index 4aac57f96d..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.21.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "\ - http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ -" -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1 \ -" -SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1" -SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" diff --git a/recipes/glib-2.0/glib-2.0_2.21.6.bb b/recipes/glib-2.0/glib-2.0_2.21.6.bb new file mode 100644 index 0000000000..4aac57f96d --- /dev/null +++ b/recipes/glib-2.0/glib-2.0_2.21.6.bb @@ -0,0 +1,12 @@ +require glib.inc +PR = "${INC_PR}.0" + +SRC_URI = "\ + http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1 \ +" +SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1 \ +" +SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1" +SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" -- cgit v1.2.3