diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-10-07 17:35:31 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-10-07 17:35:31 +0000 |
| commit | 609eabf6ac2227cb5a05b49a9c7cf6b91c7b43c2 (patch) | |
| tree | 191ec144e176139366593570580d3a2e7bc0d5fd /packages/glib-2.0 | |
| parent | 93cb66f73e3d585bec0b18e432082a834dbe0df1 (diff) | |
glib-2.0-2.14.0: fix inline warnings with gcc 4.2 in gutils.h
Diffstat (limited to 'packages/glib-2.0')
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch | 17 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.14.0.bb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch b/packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch new file mode 100644 index 0000000000..ea2b41e900 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch @@ -0,0 +1,17 @@ +Index: glib-2.12.9/glib/gutils.h +=================================================================== +--- glib-2.12.9.orig/glib/gutils.h 2007-10-07 19:13:53.000000000 +0200 ++++ glib-2.12.9/glib/gutils.h 2007-10-07 19:15:04.000000000 +0200 +@@ -97,7 +97,11 @@ + # define G_INLINE_FUNC + # undef G_CAN_INLINE + #elif defined (__GNUC__) +-# define G_INLINE_FUNC extern inline ++# if defined (__GNUC_GNU_INLINE__) ++# define G_INLINE_FUNC extern __attribute__((gnu_inline)) inline ++# else ++# define G_INLINE_FUNC extern inline ++# endif + #elif defined (G_CAN_INLINE) + # define G_INLINE_FUNC static inline + #else /* can't inline */ diff --git a/packages/glib-2.0/glib-2.0_2.14.0.bb b/packages/glib-2.0/glib-2.0_2.14.0.bb index 995efbd119..e4318cd1f0 100644 --- a/packages/glib-2.0/glib-2.0_2.14.0.bb +++ b/packages/glib-2.0/glib-2.0_2.14.0.bb @@ -2,4 +2,5 @@ require glib.inc SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" + file://configure-libtool.patch;patch=1 \ + file://gcc-4.2-inline-fix.patch;patch=1" |