diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-21 15:32:51 +0000 |
---|---|---|
committer | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-21 15:32:51 +0000 |
commit | 9c6043280dda581f25c502be1c776babf4ec51f3 (patch) | |
tree | f523aa3b6deb00fe4e39635b99e11b89a8464b48 | |
parent | 9e36ae107209a43916609aea9a39faa10a1331ad (diff) |
glib-2.0-2.16.1: apply the gcc-4.2-inline-fix again
* it's supposedly applied upstream, but it doesn't work:
s/__GNUC_STDC_INLINE__/__GNUC_GNU_INLINE__/ makes the difference.
-rw-r--r-- | packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch | 13 | ||||
-rw-r--r-- | packages/glib-2.0/glib-2.0_2.16.1.bb | 1 |
2 files changed, 14 insertions, 0 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 new file mode 100644 index 0000000000..d6cbeeb8a4 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch @@ -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 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 08ff056c80..111b3f59e3 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 @@ -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 \ " |