Merge pull request #53347 from dtzWill/update/libxslt-1.1.33
libxslt: 1.1.32 -> 1.1.33, cleanup
This commit is contained in:
commit
52ee4d07b6
@ -10,22 +10,14 @@ with stdenv.lib;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libxslt";
|
pname = "libxslt";
|
||||||
version = "1.1.32";
|
version = "1.1.33";
|
||||||
name = pname + "-" + version;
|
name = pname + "-" + version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://xmlsoft.org/sources/${name}.tar.gz";
|
url = "http://xmlsoft.org/sources/${name}.tar.gz";
|
||||||
sha256 = "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj";
|
sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
|
|
||||||
|
|
||||||
# fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified
|
|
||||||
postPatch = optionalString stdenv.hostPlatform.isCygwin ''
|
|
||||||
substituteInPlace tests/plugins/Makefile.in \
|
|
||||||
--replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)'
|
|
||||||
'';
|
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
|
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
|
||||||
|
|
||||||
buildInputs = [ libxml2.dev ]
|
buildInputs = [ libxml2.dev ]
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
$NetBSD: patch-ah,v 1.3 2012/11/27 12:17:51 adam Exp $
|
|
||||||
|
|
||||||
Fix syms file for stricter solaris ld
|
|
||||||
|
|
||||||
--- libxslt-1.1.28/libxslt/libxslt.syms.orig 2012-11-27 12:04:43.000000000 +0000
|
|
||||||
+++ libxslt-1.1.28/libxslt/libxslt.syms
|
|
||||||
@@ -107,7 +107,7 @@ LIBXML2_1.0.11 {
|
|
||||||
xsltFreeCompMatchList;
|
|
||||||
xsltFreeTemplateHashes;
|
|
||||||
xsltGetTemplate;
|
|
||||||
- xsltMatchPattern;
|
|
||||||
+# xsltMatchPattern;
|
|
||||||
xsltTestCompMatchList;
|
|
||||||
|
|
||||||
# preproc
|
|
||||||
@@ -407,7 +407,7 @@ LIBXML2_1.1.18 {
|
|
||||||
global:
|
|
||||||
|
|
||||||
# xsltInternals
|
|
||||||
- xsltConstNamespaceNameXSLT; # variable
|
|
||||||
+# xsltConstNamespaceNameXSLT; # variable
|
|
||||||
xsltExtensionInstructionResultFinalize;
|
|
||||||
xsltExtensionInstructionResultRegister;
|
|
||||||
xsltInitCtxtKey;
|
|
||||||
@@ -416,24 +416,24 @@ LIBXML2_1.1.18 {
|
|
||||||
xsltInit;
|
|
||||||
|
|
||||||
# xsltInternals
|
|
||||||
- xsltParseAnyXSLTElem;
|
|
||||||
- xsltParseSequenceConstructor;
|
|
||||||
- xsltPointerListAddSize;
|
|
||||||
- xsltPointerListClear;
|
|
||||||
- xsltPointerListCreate;
|
|
||||||
- xsltPointerListFree;
|
|
||||||
+# xsltParseAnyXSLTElem;
|
|
||||||
+# xsltParseSequenceConstructor;
|
|
||||||
+# xsltPointerListAddSize;
|
|
||||||
+# xsltPointerListClear;
|
|
||||||
+# xsltPointerListCreate;
|
|
||||||
+# xsltPointerListFree;
|
|
||||||
xsltRegisterLocalRVT;
|
|
||||||
xsltReleaseRVT;
|
|
||||||
- xsltRestoreDocumentNamespaces;
|
|
||||||
+# xsltRestoreDocumentNamespaces;
|
|
||||||
|
|
||||||
# extensions
|
|
||||||
- xsltStyleStylesheetLevelGetExtData;
|
|
||||||
+# xsltStyleStylesheetLevelGetExtData;
|
|
||||||
|
|
||||||
# xsltInternals
|
|
||||||
# xsltTransStorageAdd; removed in 1.1.28
|
|
||||||
# xsltTransStorageRemove; removed in 1.1.28
|
|
||||||
xsltUninit;
|
|
||||||
- xsltXSLTAttrMarker; # variable
|
|
||||||
+# xsltXSLTAttrMarker; # variable
|
|
||||||
} LIBXML2_1.1.9;
|
|
||||||
|
|
||||||
LIBXML2_1.1.20 {
|
|
||||||
@@ -476,6 +476,10 @@ LIBXML2_1.1.26 {
|
|
||||||
|
|
||||||
# transform
|
|
||||||
xsltProcessOneNode;
|
|
||||||
+
|
|
||||||
+# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
|
|
||||||
+ local:
|
|
||||||
+ *;
|
|
||||||
} LIBXML2_1.1.25;
|
|
||||||
|
|
||||||
LIBXML2_1.1.27 {
|
|
Loading…
Reference in New Issue
Block a user