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/glib-2.0/glib-2.0-2.18.1 | |
| parent | aa41c19334ed4a1607f5a2657eba1e504344a32c (diff) | |
| download | openembedded-e30b56be6a7bb8ace65bac3af15fc0319347952f.tar.gz | |
glibc-2.0: removed 2.18 recipes
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/glib-2.0/glib-2.0-2.18.1')
| -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 |
2 files changed, 0 insertions, 76 deletions
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 |