[csw-devel] SF.net SVN: gar:[7560] csw/mgar/pkg/libxml2/trunk

[bdwalton at users.sourceforge.net]

Revision: 7560
          http://gar.svn.sourceforge.net/gar/?rev=7560&view=rev
Author:   bdwalton
Date:     2009-12-06 04:23:50 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
libxml2: patch in casts to fix compile breakage; enable pycompile, striplibtool

Modified Paths:
--------------
    csw/mgar/pkg/libxml2/trunk/Makefile
    csw/mgar/pkg/libxml2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
    csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch

Modified: csw/mgar/pkg/libxml2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml2/trunk/Makefile	2009-12-05 19:33:51 UTC (rev 7559)
+++ csw/mgar/pkg/libxml2/trunk/Makefile	2009-12-06 04:23:50 UTC (rev 7560)
@@ -9,6 +9,8 @@
 
 MASTER_SITES = ftp://xmlsoft.org/libxml2/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = ld-symbol-handling-fixup.patch
+PATCHFILES += 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -39,6 +41,10 @@
 BUILD64 = 1
 NO_ISAEXEC = 1
 
+PYCOMPILE = 1
+
+STRIP_LIBTOOL = 1
+
 # Skip 64 bit binaries - they are just big and gain nothing
 MERGE_DIRS_isa-sparcv9 = $(libdir)
 MERGE_DIRS_isa-amd64 = $(libdir)

Modified: csw/mgar/pkg/libxml2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libxml2/trunk/checksums	2009-12-05 19:33:51 UTC (rev 7559)
+++ csw/mgar/pkg/libxml2/trunk/checksums	2009-12-06 04:23:50 UTC (rev 7560)
@@ -1 +1,3 @@
-8f4fda3969237c2a33bdb1583b5d06b2  download/libxml2-2.7.3.tar.gz
+f0a8df3f16e7e44d6252d6f0f1896214  0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
+5e371e0f0921fc7b366c34aded6ae993  ld-symbol-handling-fixup.patch
+7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz

Added: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch	                        (rev 0)
+++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch	2009-12-06 04:23:50 UTC (rev 7560)
@@ -0,0 +1,42 @@
+From 960433c24da65100dcb57ec9ce801d59a86722cb Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Sat, 5 Dec 2009 13:32:49 -0500
+Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11
+
+Sun Studio 11 was failing to compile relaxng.c due to a type mismatch
+when calling xmlRngPErr.  The issue was caused by a type mismatch with
+in the outcomes of a ternary operation ("nothing" vs node->name).
+
+Cleanup another warning by casting a string literal to const unsigned
+char *.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ relaxng.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/relaxng.c b/relaxng.c
+index 075fc4a..9c6019d 100644
+--- a/relaxng.c
++++ b/relaxng.c
+@@ -5369,7 +5369,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
+     } else {
+         xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
+                    "expecting name, anyName, nsName or choice : got %s\n",
+-                   (node == NULL ? "nothing" : node->name), NULL);
++                   (node == NULL ? (const unsigned char *) "nothing" : node->name), NULL);
+         return (NULL);
+     }
+     if (ret != def) {
+@@ -9459,7 +9459,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt,
+             ctxt->states = NULL;
+             if (found == 0) {
+                 if (cur == NULL) {
+-                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
++		     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname");
+                 } else {
+                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
+                 }
+-- 
+1.6.5.3
+

Added: csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch	                        (rev 0)
+++ csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch	2009-12-06 04:23:50 UTC (rev 7560)
@@ -0,0 +1,21 @@
+--- libxml2-2.7.6/configure.orig	2009-12-06 02:38:02.408924064 +0100
++++ libxml2-2.7.6/configure	2009-12-06 02:38:28.581172792 +0100
+@@ -12150,15 +12150,10 @@
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ test "`uname`" == "SunOS" && \
+-    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++    VERSION_SCRIPT_FLAGS="-Wl,-M"
+ 
+- if test -n "$VERSION_SCRIPT_FLAGS"; then
+-  USE_VERSION_SCRIPT_TRUE=
+-  USE_VERSION_SCRIPT_FALSE='#'
+-else
+-  USE_VERSION_SCRIPT_TRUE='#'
+-  USE_VERSION_SCRIPT_FALSE=
+-fi
++USE_VERSION_SCRIPT_TRUE='#'
++USE_VERSION_SCRIPT_FALSE=
+ 
+ 
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.