diff options
| author | Phil Blundell <philb@gnu.org> | 2008-11-09 09:42:44 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2008-11-09 09:42:44 +0000 |
| commit | dda91f2523aa41b263094bc3bcffeabc4b1b2b8d (patch) | |
| tree | d5505e9e433ce5c935690256abc0f4a3a02ab7c0 | |
| parent | b71fd3c563f96ad4fb6f1d359b114184ccc73274 (diff) | |
glib-2.0: apply patch from Andrea Adami to make thumb work with 2.18.1
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch | 42 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.18.1.bb | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch b/packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch new file mode 100644 index 0000000000..d7aa08821f --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.18.1/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/packages/glib-2.0/glib-2.0_2.18.1.bb b/packages/glib-2.0/glib-2.0_2.18.1.bb index 3ac0487018..1083ef4ba0 100644 --- a/packages/glib-2.0/glib-2.0_2.18.1.bb +++ b/packages/glib-2.0/glib-2.0_2.18.1.bb @@ -9,3 +9,4 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1 \ " +SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1" |