Fix 'make check'

svn path=/trunk/; revision=5622

diff --git a/ChangeLog b/ChangeLog
index 18f68fc..68ece8c 100644 (file)
--- 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 7c692ca..bbd30e7 100755 (executable)
--- 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