glib-2.0-2.16.1: apply the gcc-4.2-inline-fix again
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 21 Mar 2008 15:32:51 +0000 (15:32 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 21 Mar 2008 15:32:51 +0000 (15:32 +0000)
* it's supposedly applied upstream, but it doesn't work:
  s/__GNUC_STDC_INLINE__/__GNUC_GNU_INLINE__/ makes the difference.

packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch [new file with mode: 0644]
packages/glib-2.0/glib-2.0_2.16.1.bb

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
new file mode 100644 (file)
index 0000000..d6cbeeb
--- /dev/null
@@ -0,0 +1,13 @@
+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 @@
+ #  define G_INLINE_FUNC
+ #  undef  G_CAN_INLINE
+ #elif defined (__GNUC__) 
+-#  ifdef __GNUC_STDC_INLINE__
++#  ifdef __GNUC_GNU_INLINE__
+ #   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+ #  else
+ #   define G_INLINE_FUNC extern inline
index 08ff056..111b3f5 100644 (file)
@@ -3,4 +3,5 @@ require glib.inc
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \
+           file://gcc-4.2-inline-fix.patch;patch=1 \
           "