Make these work on x86_64

svn path=/trunk/; revision=7744

diff --git a/ChangeLog b/ChangeLog
index f36c968550a6676d782f99d8d3572b8f172861e9..d8170e53eb6818fc3e4f2c0c63759b900aff75f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-12  Dan Winship  <danw@gnome.org>
+
+       * glib/pltcheck.sh: make this work on x86_64
+ 
 2008-12-12  Ryan Lortie  <desrt@desrt.ca>
 
        * gio/gicon.c (g_icon_to_string_tokenized): free the tokens when done

diff --git a/gio/ChangeLog b/gio/ChangeLog
index fb8d548419c8259e090f7e93e7ad5eff53dbec9f..f80dbfe8c1f82385329a7b455cd4fc95bebb35e4 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-12  Dan Winship  <danw@gnome.org>
+
+       * pltcheck.sh: make this work on x86_64
+
 2008-12-10  Alexander Larsson  <alexl@redhat.com>
 
        Bug 562452 - Ensure we return G_IO_ERROR_CANCELLED if cancelling

diff --git a/gio/pltcheck.sh b/gio/pltcheck.sh
index 57ecd9d9ce15d2a1e49b9746a986708c32b78f84..e09a587c5546f867ed6c3d686992fb42e6a8bc0b 100755 (executable)
--- a/gio/pltcheck.sh
+++ b/gio/pltcheck.sh
@@ -13,7 +13,7 @@ SKIP='\<g_access\|\<g_array_\|\<g_ascii\|\<g_list_\|\<g_assertion_message\|\<g_w
 
 for so in .libs/lib*.so; do
        echo Checking $so for local PLT entries
-       readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<g_' | grep -v $SKIP && status=1
+       readelf -r $so | grep 'JU\?MP_SLOT\?' | grep '\<g_' | grep -v $SKIP && status=1
 done
 
 exit $status

diff --git a/glib/pltcheck.sh b/glib/pltcheck.sh
index b5e7d9a5bbbd42b20c1bcd49fd2c7c75e7573603..236eeb141bbbce95f77bd34f12b5e8c708386eb9 100755 (executable)
--- a/glib/pltcheck.sh
+++ b/glib/pltcheck.sh
@@ -14,7 +14,7 @@ for so in .libs/lib*.so; do
        # g_string_insert_c is used in g_string_append_c_inline
        # unaliased.  Couldn't find a way to fix it.
        # Same for g_once_init_enter
-       readelf -r $so | grep 'JU\?MP_SLOT' | \
+       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_impl\>' | \

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 13697bdee7bd3c3aa9405ce9b0a0f55d486ffa07..d893458e8a41a4b005be629c1d314713ba26edcf 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-12  Dan Winship  <danw@gnome.org>
+
+       * pltcheck.sh: make this work on x86_64
+
 2008-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 473150 – g_type_module_use inconsistently increases the use

diff --git a/gobject/pltcheck.sh b/gobject/pltcheck.sh
index 19edfac021a02b782a1c8ca5b8aef8a536020ff8..00d9e9d09a34df78e9de1fb9e9b38f8982dffb0f 100755 (executable)
--- a/gobject/pltcheck.sh
+++ b/gobject/pltcheck.sh
@@ -11,7 +11,7 @@ fi
 
 for so in .libs/lib*.so; do
        echo Checking $so for local PLT entries
-       readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<g_type_\|\<g_boxed_\|\<g_value_\|\<g_cclosure_\|\<g_closure_\|\<g_signal\|\<g_enum_\|\<g_flags_\|\<g_io_\|\<g_object_\|\<g_param_' && status=1
+       readelf -r $so | grep 'JU\?MP_SLOT\?' | grep '\<g_type_\|\<g_boxed_\|\<g_value_\|\<g_cclosure_\|\<g_closure_\|\<g_signal\|\<g_enum_\|\<g_flags_\|\<g_io_\|\<g_object_\|\<g_param_' && status=1
 done
 
 exit $status