Don't use __abort_msg from glibc
This commit is contained in:
parent
c13999fd89
commit
b2329ca8a3
17
glib-abort-msg.patch
Normal file
17
glib-abort-msg.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff -up glib-2.23.2/glib/gtestutils.c.abort_msg glib-2.23.2/glib/gtestutils.c
|
||||||
|
--- glib-2.23.2/glib/gtestutils.c.abort_msg 2010-01-25 18:32:10.793495994 -0500
|
||||||
|
+++ glib-2.23.2/glib/gtestutils.c 2010-01-25 18:33:23.898497049 -0500
|
||||||
|
@@ -40,7 +40,12 @@
|
||||||
|
#ifdef HAVE_SYS_SELECT_H
|
||||||
|
#include <sys/select.h>
|
||||||
|
#endif /* HAVE_SYS_SELECT_H */
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+/* We can't use the libc variable, since rpm doesn't let us depend on
|
||||||
|
+ * GLIBC_PRIVATE symbols.
|
||||||
|
+ */
|
||||||
|
+#undef HAVE_LIBC_ABORT_MSG
|
||||||
|
+
|
||||||
|
/* if we have a recent enough glibc, use its __abort_msg variable for storing
|
||||||
|
* assertion messages (just like assert()). If not, declare our own variable,
|
||||||
|
* so that platforms with older glibc or different libc implementations can use
|
@ -3,7 +3,7 @@
|
|||||||
Summary: A library of handy utility functions
|
Summary: A library of handy utility functions
|
||||||
Name: glib2
|
Name: glib2
|
||||||
Version: 2.23.2
|
Version: 2.23.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
@ -22,6 +22,9 @@ BuildRequires: zlib-devel
|
|||||||
BuildRequires: automake autoconf libtool
|
BuildRequires: automake autoconf libtool
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
|
|
||||||
|
# http://bugzilla.gnome.org/show_bug.cgi?id=594872
|
||||||
|
Patch0: glib-abort-msg.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GLib is the low-level core library that forms the basis
|
GLib is the low-level core library that forms the basis
|
||||||
for projects such as GTK+ and GNOME. It provides data structure
|
for projects such as GTK+ and GNOME. It provides data structure
|
||||||
@ -154,6 +157,9 @@ esac
|
|||||||
%{_libdir}/lib*.a
|
%{_libdir}/lib*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.2-2
|
||||||
|
- Drop the dependency on a GLIBC_PRIVATE symbol
|
||||||
|
|
||||||
* Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.2-1
|
* Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.2-1
|
||||||
- Update to 2.23.2
|
- Update to 2.23.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user