diff options
| author | woglinde <heinold@inf.fu-berlin.de> | 2008-11-06 01:06:19 +0100 |
|---|---|---|
| committer | woglinde <heinold@inf.fu-berlin.de> | 2008-11-06 01:07:56 +0100 |
| commit | da9083a0941ef11ec535a657512da8d8ce71cb47 (patch) | |
| tree | 83a75a581a9e3a04ee8dd539333ffe04d602a9b0 /packages/glib-2.0 | |
| parent | c51ce4a258c657dc646bfc01d77f1b71c0c3af4f (diff) | |
glib-2.0: fix atomic-thumb.patch
* is only in included in glib-2.0_2.16.4
* missed depenedcy on .la file
* bump PR of glib-2.0_2.16.4
Diffstat (limited to 'packages/glib-2.0')
| -rw-r--r-- | packages/glib-2.0/files/atomic-thumb.patch | 12 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.16.4.bb | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/packages/glib-2.0/files/atomic-thumb.patch b/packages/glib-2.0/files/atomic-thumb.patch index d1e3d49a6b..ced49f4acd 100644 --- a/packages/glib-2.0/files/atomic-thumb.patch +++ b/packages/glib-2.0/files/atomic-thumb.patch @@ -1,8 +1,10 @@ # 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. ---- glib/glib/Makefile.am~ 2008-07-01 23:30:12.000000000 +0100 -+++ glib/glib/Makefile.am 2008-10-27 10:03:42.000000000 +0000 +Index: glib-2.16.4/glib/Makefile.am +=================================================================== +--- glib-2.16.4.orig/glib/Makefile.am 2008-11-06 00:53:11.253367291 +0100 ++++ glib-2.16.4/glib/Makefile.am 2008-11-06 00:54:13.453356583 +0100 @@ -80,6 +80,7 @@ galiasdef.c @@ -27,12 +29,14 @@ gbacktrace.c \ gbase64.c \ gbookmarkfile.c \ -@@ -285,7 +290,7 @@ +@@ -285,8 +290,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@ ++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.16.4.bb b/packages/glib-2.0/glib-2.0_2.16.4.bb index 1b817a9ee5..a1ce510c51 100644 --- a/packages/glib-2.0/glib-2.0_2.16.4.bb +++ b/packages/glib-2.0/glib-2.0_2.16.4.bb @@ -3,7 +3,7 @@ require glib.inc # This version requires a newer libtool that isn't default yet DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ |