diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-15 15:36:28 +0200 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-15 15:36:28 +0200 |
commit | e30b56be6a7bb8ace65bac3af15fc0319347952f (patch) | |
tree | e2a8381fd1616cb05454250644ecfee9827c0e99 /recipes | |
parent | aa41c19334ed4a1607f5a2657eba1e504344a32c (diff) |
glibc-2.0: removed 2.18 recipes
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch | 34 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch | 42 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch | 34 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch | 42 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch | 34 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0-native_2.18.0.bb | 43 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0_2.18.0.bb | 11 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0_2.18.1.bb | 12 | ||||
-rw-r--r-- | recipes/glib-2.0/glib-2.0_2.18.3.bb | 12 |
9 files changed, 0 insertions, 264 deletions
diff --git a/recipes/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.0/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.18.1/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch deleted file mode 100644 index d7aa08821f..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.1/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.18.1/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.1/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.18.3/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch deleted file mode 100644 index d7aa08821f..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.3/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.18.3/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.3/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-native_2.18.0.bb b/recipes/glib-2.0/glib-2.0-native_2.18.0.bb deleted file mode 100644 index bf40524f6a..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.18.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -require glib-2.0_${PV}.bb - -DEPENDS = "gettext-native gtk-doc-native" -EXTRA_OECONF = "" -PR = "r4" - -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 () { - : -} - -SRC_URI[md5sum] = "06e5afe4ce055085dc5fd9fdab527bf7" -SRC_URI[sha256sum] = "624b9cfccc14781e699c9a3b2e332a51d63bba392c82d57b510d07a3f702362e" diff --git a/recipes/glib-2.0/glib-2.0_2.18.0.bb b/recipes/glib-2.0/glib-2.0_2.18.0.bb deleted file mode 100644 index d657462b96..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.18.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "\ - http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch \ -" - -SRC_URI[md5sum] = "06e5afe4ce055085dc5fd9fdab527bf7" -SRC_URI[sha256sum] = "624b9cfccc14781e699c9a3b2e332a51d63bba392c82d57b510d07a3f702362e" diff --git a/recipes/glib-2.0/glib-2.0_2.18.1.bb b/recipes/glib-2.0/glib-2.0_2.18.1.bb deleted file mode 100644 index cf676eff2b..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.18.1.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.18/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch \ -" -SRC_URI_append_arm = " file://atomic-thumb.patch" - -SRC_URI[md5sum] = "51a9a33f49a4896d4d95d8e980666b9e" -SRC_URI[sha256sum] = "57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0" diff --git a/recipes/glib-2.0/glib-2.0_2.18.3.bb b/recipes/glib-2.0/glib-2.0_2.18.3.bb deleted file mode 100644 index d4f609e0b9..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.18.3.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.18/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch \ -" -SRC_URI_append_arm = " file://atomic-thumb.patch" - -SRC_URI[md5sum] = "f13996a7bd57525d796a6593f26a7771" -SRC_URI[sha256sum] = "9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36" |