From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Mon, 15 Aug 2005 05:00:57 +0000 (+0000)
Subject: Fix abi checks for ia64.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=30828b953a5963d311e280a6af8d1b4fc71d4229;p=dana%2Fcg-glib.git

Fix abi checks for ia64.
---

diff --git a/ChangeLog b/ChangeLog
index 999078cd..d94f01f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/abicheck.sh, gobject/abicheck.sh: Make the 
+	check work on ia64 too, where some symbols ended up 
+	in yet another section.
+
 2005-08-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 999078cd..d94f01f3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/abicheck.sh, gobject/abicheck.sh: Make the 
+	check work on ia64 too, where some symbols ended up 
+	in yet another section.
+
 2005-08-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 999078cd..d94f01f3 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/abicheck.sh, gobject/abicheck.sh: Make the 
+	check work on ia64 too, where some symbols ended up 
+	in yet another section.
+
 2005-08-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 999078cd..d94f01f3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/abicheck.sh, gobject/abicheck.sh: Make the 
+	check work on ia64 too, where some symbols ended up 
+	in yet another section.
+
 2005-08-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/glib/abicheck.sh b/glib/abicheck.sh
index 9f522180..c814ba15 100755
--- a/glib/abicheck.sh
+++ b/glib/abicheck.sh
@@ -8,6 +8,6 @@ INCLUDES="$INCLUDES -include glibconfig.cpp"
 cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 rm glibconfig.cpp
 
-nm -D .libs/libglib-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libglib-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
 
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff --git a/gobject/abicheck.sh b/gobject/abicheck.sh
index 0e1d4e6c..74391cde 100755
--- a/gobject/abicheck.sh
+++ b/gobject/abicheck.sh
@@ -8,6 +8,6 @@ INCLUDES="$INCLUDES -include glibconfig.cpp"
 cpp -DINCLUDE_VARIABLES -P $INCLUDES -DALL_FILES ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 rm glibconfig.cpp
 
-nm -D .libs/libgobject-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgobject-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
 
 diff -u expected-abi actual-abi && rm expected-abi actual-abi