7153397 libexslt is built incorrectly
authorRich Burridge <rich.burridge@oracle.com>
Tue, 13 Mar 2012 13:16:02 -0700
changeset 732 3fbb6f34cd2f
parent 731 2a19ec4c0d8f
child 733 8a34b024f468
7153397 libexslt is built incorrectly
components/libxslt/Makefile
components/libxslt/mapfile.exslt
components/libxslt/patches/libxslt.patch
--- a/components/libxslt/Makefile	Tue Mar 13 10:07:00 2012 -0700
+++ b/components/libxslt/Makefile	Tue Mar 13 13:16:02 2012 -0700
@@ -56,7 +56,6 @@
 
 COMPONENT_PREP_ACTION = \
 	(cd $(@D) ; cp ../mapfile.xslt libxslt/libxslt.syms ; \
-		    cp ../mapfile.exslt libexslt/libexslt.syms ; \
 		    $(RM) libxslt/xsltconfig.h libexslt/exsltconfig.h ; \
 		    libtoolize --force --copy ; aclocal ; \
 		    automake --addmissing --copy ; autoconf)
--- a/components/libxslt/mapfile.exslt	Tue Mar 13 10:07:00 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-# Note that the source above actually lives in the ON tree.
-#
-$mapfile_version 2
-
-SYMBOL_VERSION SUNW_1.1 {
-	global:
-		exsltCommonRegister;
-		exsltDateRegister;
-		exsltDynRegister;
-		exsltFuncRegister;
-		exsltMathRegister;
-		exsltRegisterAll;
-		exsltSaxonRegister;
-		exsltSetsRegister;
-		exsltStrRegister;
-		exsltLibexsltVersion;
-		exsltLibraryVersion;
-		exsltLibxmlVersion;
-		exsltLibxsltVersion;
-	local:
-		*;
-};
--- a/components/libxslt/patches/libxslt.patch	Tue Mar 13 10:07:00 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- libxslt-1.1.26/libexslt/Makefile.am.orig	Mon Mar 21 11:57:38 2011
-+++ libxslt-1.1.26/libexslt/Makefile.am	Mon Mar 21 12:00:10 2011
[email protected]@ -26,8 +26,18 @@
- 	libexslt.h			\
- 	dynamic.c
- 
-+if USE_VERSION_SCRIPT
-+LIBEXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libexslt.syms
-+else
-+LIBEXSLT_VERSION_SCRIPT =
-+endif
-+
- libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
--libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info @[email protected] $(LIBGCRYPT_LIBS)
-+libexslt_la_LDFLAGS =					\
-+		$(WIN32_EXTRA_LDFLAGS)			\
-+		$(LIBEXSLT_VERSION_SCRIPT)		\
-+		$(LIBGCRYPT_LIBS)			\
-+		-version-info @[email protected]
- 
- man_MANS = libexslt.3
-