rpms/glib2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix inline support

Browse Source
This commit is contained in:
Matthias Clasen 2008-03-03 14:48:18 +00:00
parent 88c742f8e5
commit 5b0f625890
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib2.spec
View File

@ -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 <mclasen@redhat.com> - 2.15.6-2
- Fix inline support
* Mon Feb 25 2008 Matthias Clasen <mclasen@redhat.com> - 2.15.6-1
- Update to 2.15.6

16
inline.patch Normal file
View File

@ -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 */