From 5b0f62589048de37274c41887a609fd7bc476db2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mar 03 2008 14:48:18 +0000 Subject: fix inline support --- diff --git a/glib2.spec b/glib2.spec index b567d37..8e348a0 100644 --- a/glib2.spec +++ b/glib2.spec @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.15.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -18,6 +18,8 @@ BuildRequires: libattr-devel BuildRequires: libselinux-devel # for sys/inotify.h BuildRequires: glibc-devel +# fixed in upstream svn +Patch0: inline.patch %description @@ -51,6 +53,7 @@ of version 2 of the GLib library. %prep %setup -q -n glib-%{version} +%patch0 -p1 -b .inline %build %configure --disable-gtk-doc --enable-static @@ -123,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.a %changelog +* Mon Mar 3 2008 Matthias Clasen - 2.15.6-2 +- Fix inline support + * Mon Feb 25 2008 Matthias Clasen - 2.15.6-1 - Update to 2.15.6 diff --git a/inline.patch b/inline.patch new file mode 100644 index 0000000..638a95c --- /dev/null +++ b/inline.patch @@ -0,0 +1,16 @@ +diff -up glib-2.15.6/glib/gutils.h.inline glib-2.15.6/glib/gutils.h +--- glib-2.15.6/glib/gutils.h.inline 2008-03-03 09:46:44.000000000 -0500 ++++ glib-2.15.6/glib/gutils.h 2008-03-03 09:46:52.000000000 -0500 +@@ -97,7 +97,11 @@ G_BEGIN_DECLS + # define G_INLINE_FUNC + # undef G_CAN_INLINE + #elif defined (__GNUC__) +-# define G_INLINE_FUNC static __inline __attribute__ ((unused)) ++# ifdef __GNUC_STDC_INLINE__ ++# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__)) ++# else ++# define G_INLINE_FUNC extern inline ++# endif + #elif defined (G_CAN_INLINE) + # define G_INLINE_FUNC static inline + #else /* can't inline */