diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-06-14 08:14:54 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-06-14 08:14:54 +0000 |
| commit | d9dc63681924fee10ecd64b005286b97e443ff91 (patch) | |
| tree | 8a6b0c15b1621386c0569964712bd5408f4982ed /x11-toolkits/gtk20 | |
| parent | - Activate tcl/tk 8.5 (diff) | |
Fix the build on powerpc64.
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', one of which GTK 2.0 has.
PR: ports/147699
Submitted by: nwhitehorn@
Notes
Notes:
svn path=/head/; revision=256503
Diffstat (limited to 'x11-toolkits/gtk20')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/extra-arch-powerpc64 | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 1452bde9220c..e38f8935ca4c 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -63,6 +63,10 @@ CONFIGURE_ARGS+= --enable-debug=yes .include <bsd.port.pre.mk> +.if ${ARCH} == powerpc64 +EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64 +.endif + .if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \ !defined(WITHOUT_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client diff --git a/x11-toolkits/gtk20/files/extra-arch-powerpc64 b/x11-toolkits/gtk20/files/extra-arch-powerpc64 new file mode 100644 index 000000000000..2a2c4aa06540 --- /dev/null +++ b/x11-toolkits/gtk20/files/extra-arch-powerpc64 @@ -0,0 +1,20 @@ +--- gtk/gtkbuilderparser.c.dist 2010-06-08 14:11:06.000000000 -0500 ++++ gtk/gtkbuilderparser.c 2010-06-08 14:11:33.000000000 -0500 +@@ -1051,7 +1051,7 @@ + /* Called for character data */ + /* text is not nul-terminated */ + static void +-text (GMarkupParseContext *context, ++XXXtext (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, +@@ -1106,7 +1106,7 @@ + static const GMarkupParser parser = { + start_element, + end_element, +- text, ++ XXXtext, + NULL, + NULL + }; |