misc/152555: [patch] make devel/glib20 build on powerpc64

[Andreas Tobler]

>Number:         152555
>Category:       misc
>Synopsis:       [patch] make devel/glib20 build on powerpc64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 24 20:20:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Andreas Tobler
>Release:        -CURRENT
>Organization:
none
>Environment:
[bohrium:~] andreast% uname -ra
FreeBSD bohrium.andreas.nets 9.0-CURRENT FreeBSD 9.0-CURRENT #10 r215793M: Wed Nov 24 18:48:55 CET 2010     andreast at bohrium.andreas.nets:/usr/obj/export/devel/fbsd/src/sys/GENERIC64_G5  powerpc
>Description:
Due to a flaw in binutils 2.15, function names can conflict with
ELF assembler directives on PPC64 systems. As a result, it is not possible
to have functions named things like 'text' and 'data'.
In glib-compile-schemas.c we have such a name.
See also ports/147699.
>How-To-Repeat:

>Fix:
Attached patch fixes the build.

Patch attached with submission follows:

--- gio/glib-compile-schemas.c.orig	2010-11-24 21:32:15.000000000 +0100
+++ gio/glib-compile-schemas.c	2010-11-24 21:33:42.000000000 +0100
@@ -1458,7 +1458,7 @@
 }
 /* Text {{{2 */
 static void
-text (GMarkupParseContext  *context,
+XXXtext (GMarkupParseContext  *context,
       const gchar          *text,
       gsize                 text_len,
       gpointer              user_data,
@@ -1590,7 +1590,7 @@
 parse_gschema_files (gchar    **files,
                      gboolean   strict)
 {
-  GMarkupParser parser = { start_element, end_element, text };
+  GMarkupParser parser = { start_element, end_element, XXXtext };
   ParseState state = { 0, };
   const gchar *filename;
   GError *error = NULL;


>Release-Note:
>Audit-Trail:
>Unformatted: