diff options
| author | Khem Raj <raj.khem@gmail.com> | 2008-06-04 23:10:47 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2008-06-04 23:10:47 +0000 |
| commit | 1ad39f44c290cb5b20be8a00e8e05da78fb85444 (patch) | |
| tree | 6a27b44dbe9f43bc2672264ee0f0cc7a85469298 /packages/glib-2.0 | |
| parent | 3b8ff8bcbd52202370f6d0715aeab0e18155ab28 (diff) | |
Make inline patch also applicable to gcc 4.3 now that gcc 4.3 implements C99 conformant inline behaviour.
Diffstat (limited to 'packages/glib-2.0')
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch | 30 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.16.1.bb | 2 |
2 files changed, 24 insertions, 8 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch index d6cbeeb8a4..b21851bd63 100644 --- a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch +++ b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch @@ -1,13 +1,29 @@ +Stole from gentoo bugzilla +http://bugs.gentoo.org/show_bug.cgi?id=156475 + +Lets this work with gcc 4.2/4.3 +-Khem Index: glib-2.16.1/glib/gutils.h =================================================================== ---- glib-2.16.1.orig/glib/gutils.h 2008-03-21 16:18:57.000000000 +0100 -+++ glib-2.16.1/glib/gutils.h 2008-03-21 16:19:09.000000000 +0100 -@@ -97,7 +97,7 @@ +--- glib-2.16.1.orig/glib/gutils.h 2008-03-10 17:31:56.000000000 -0700 ++++ glib-2.16.1/glib/gutils.h 2008-06-04 15:19:12.000000000 -0700 +@@ -96,13 +96,14 @@ + #ifdef G_IMPLEMENT_INLINES # define G_INLINE_FUNC # undef G_CAN_INLINE - #elif defined (__GNUC__) +-#elif defined (__GNUC__) -# ifdef __GNUC_STDC_INLINE__ -+# ifdef __GNUC_GNU_INLINE__ - # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__)) +-# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__)) ++#elif defined (__GNUC__) ++# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \ ++ && __STDC_VERSION__ >= 199901L ++# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__)) # else - # define G_INLINE_FUNC extern inline +-# define G_INLINE_FUNC extern inline ++# define G_INLINE_FUNC extern __inline + # endif +-#elif defined (G_CAN_INLINE) ++#elif defined (G_CAN_INLINE) + # define G_INLINE_FUNC static inline + #else /* can't inline */ + # define G_INLINE_FUNC diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb index ef7a1e84fc..8f6079a84e 100644 --- a/packages/glib-2.0/glib-2.0_2.16.1.bb +++ b/packages/glib-2.0/glib-2.0_2.16.1.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r4" +PR = "r5" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ |