From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Tue, 10 Jul 2007 17:49:46 +0000 (+0000)
Subject: Fix 'make check'
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8edc84691832e4ce81ad73c67a38d767d51ef52a;p=dana%2Fcg-glib.git

Fix 'make check'

svn path=/trunk/; revision=5622
---

diff --git a/ChangeLog b/ChangeLog
index 18f68fcb..68ece8ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/pltcheck.sh: Add g_once_init_enter to the whitelist of
+	symbols allowed to have a local PLT entry, to fix 'make check'.
+
 Tue Jul 10 12:24:35 2007  Tim Janik  <timj@imendio.com>
 
 	* glib/gthread.[hc]: implemented g_once_init_enter(),
diff --git a/glib/pltcheck.sh b/glib/pltcheck.sh
index 7c692ca9..bbd30e7d 100755
--- a/glib/pltcheck.sh
+++ b/glib/pltcheck.sh
@@ -13,7 +13,8 @@ for so in .libs/lib*.so; do
 	echo Checking $so for local PLT entries
 	# g_string_insert_c is used in g_string_append_c_inline
 	# unaliased.  Couldn't find a way to fix it.
-	readelf -r $so | grep 'JU\?MP_SLOT' | grep -v '\<g_string_insert_c\>' | grep -v '\<g_atomic_[a-z]*_[sg]et\>' | grep '\<g_' && status=1
+	# Same for g_once_init_enter
+	readelf -r $so | grep 'JU\?MP_SLOT' | grep -v '\<g_string_insert_c\>' | grep -v '\<g_atomic_[a-z]*_[sg]et\>' | grep -v '\<g_once_init_enter\>' grep '\<g_' && status=1
 done
 
 exit $status