From 49a585840c95f2cd33b0da9a6c87a5c8ec99b82e Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Wed, 22 May 2019 14:48:56 +0000 Subject: [PATCH] libxslt: native build, drop mapfile --- components/libxslt/Makefile | 6 +- components/libxslt/libxslt.p5m | 34 +-- components/libxslt/manifests/sample-manifest.p5m | 33 +-- components/libxslt/mapfile.xslt | 284 ----------------------- 4 files changed, 34 insertions(+), 323 deletions(-) delete mode 100644 components/libxslt/mapfile.xslt diff --git a/components/libxslt/Makefile b/components/libxslt/Makefile index b41bee46f..3e9a9c50b 100644 --- a/components/libxslt/Makefile +++ b/components/libxslt/Makefile @@ -39,12 +39,11 @@ COMPONENT_BUGDB= library/libxslt include ../../make-rules/prep.mk include ../../make-rules/configure.mk include ../../make-rules/ips.mk -export UNAME_LEGACY= LINT_FLAGS += -I/usr/include/libxml2 CFLAGS += $(CPP_LARGEFILES) -LDFLAGS += $(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread +LDFLAGS += -lpthread CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --with-pic @@ -57,8 +56,7 @@ CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)" CONFIGURE_OPTIONS += PYTHON_VENDOR_PACKAGES=$(PYTHON_VENDOR_PACKAGES) COMPONENT_PREP_ACTION = \ - (cd $(@D) ; cp ../mapfile.xslt libxslt/libxslt.syms ; \ - $(RM) libxslt/xsltconfig.h libexslt/exsltconfig.h ; \ + (cd $(@D) ; $(RM) libxslt/xsltconfig.h libexslt/exsltconfig.h ; \ libtoolize --force --copy ; aclocal ; \ automake -f -a --copy ; autoconf) diff --git a/components/libxslt/libxslt.p5m b/components/libxslt/libxslt.p5m index 7c2092270..18cb3291c 100644 --- a/components/libxslt/libxslt.p5m +++ b/components/libxslt/libxslt.p5m @@ -20,7 +20,6 @@ # # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # - default mangler.man.stability uncommitted> set name=pkg.fmri \ value=pkg:/library/libxslt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -34,7 +33,12 @@ set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid \ value=PSARC/2002/244 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -file path=usr/bin/xslt-config facet.devel=true + +license xsl.license license=SUNWlxsl.copyright + +file path=usr/bin/$(MACH64)/xslt-config +file path=usr/bin/$(MACH64)/xsltproc +file path=usr/bin/xslt-config file path=usr/bin/xsltproc file path=usr/include/libexslt/exslt.h file path=usr/include/libexslt/exsltconfig.h @@ -60,14 +64,24 @@ file path=usr/include/libxslt/xsltconfig.h file path=usr/include/libxslt/xsltexports.h file path=usr/include/libxslt/xsltlocale.h file path=usr/include/libxslt/xsltutils.h -file path=usr/lib/$(MACH64)/libexslt.so.0 -file path=usr/lib/$(MACH64)/libxslt.so.1 +link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0.8.17 +link path=usr/lib/$(MACH64)/libexslt.so.0 target=libexslt.so.0.8.17 +file path=usr/lib/$(MACH64)/libexslt.so.0.8.17 +link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.$(COMPONENT_VERSION) +file path=usr/lib/$(MACH64)/libxslt.so.$(COMPONENT_VERSION) +link path=usr/lib/$(MACH64)/libxslt.so.1 target=libxslt.so.$(COMPONENT_VERSION) file path=usr/lib/$(MACH64)/pkgconfig/libexslt.pc file path=usr/lib/$(MACH64)/pkgconfig/libxslt.pc -file path=usr/lib/libexslt.so.0 -file path=usr/lib/libxslt.so.1 +file path=usr/lib/$(MACH64)/xsltConf.sh +link path=usr/lib/libexslt.so target=libexslt.so.0.8.17 +link path=usr/lib/libexslt.so.0 target=libexslt.so.0.8.17 +file path=usr/lib/libexslt.so.0.8.17 +link path=usr/lib/libxslt.so target=libxslt.so.$(COMPONENT_VERSION) +file path=usr/lib/libxslt.so.$(COMPONENT_VERSION) +link path=usr/lib/libxslt.so.1 target=libxslt.so.$(COMPONENT_VERSION) file path=usr/lib/pkgconfig/libexslt.pc file path=usr/lib/pkgconfig/libxslt.pc +file path=usr/lib/xsltConf.sh file path=usr/share/aclocal/libxslt.m4 file path=usr/share/lib/xslt/doc/html/API.html file path=usr/share/lib/xslt/doc/html/APIchunk0.html @@ -146,6 +160,7 @@ file path=usr/share/lib/xslt/doc/html/node.gif file path=usr/share/lib/xslt/doc/html/object.gif file path=usr/share/lib/xslt/doc/html/processing.gif file path=usr/share/lib/xslt/doc/html/python.html +file path=usr/share/lib/xslt/doc/html/redhat.gif file path=usr/share/lib/xslt/doc/html/smallfootonly.gif file path=usr/share/lib/xslt/doc/html/stylesheet.gif file path=usr/share/lib/xslt/doc/html/templates.gif @@ -158,13 +173,6 @@ file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.xml file path=usr/share/lib/xslt/doc/html/xslt.html file path=usr/share/lib/xslt/doc/html/xsltproc.html file path=usr/share/lib/xslt/doc/html/xsltproc2.html -file xslt-config.1 path=usr/share/man/man1/xslt-config.1 facet.devel=all file path=usr/share/man/man1/xsltproc.1 file path=usr/share/man/man3/libexslt.3 file path=usr/share/man/man3/libxslt.3 -legacy pkg=SUNWlxsl desc="The XSLT library" name="The XSLT library" -license xsl.license license=SUNWlxsl.copyright -link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0 -link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1 -link path=usr/lib/libexslt.so target=./libexslt.so.0 -link path=usr/lib/libxslt.so target=./libxslt.so.1 diff --git a/components/libxslt/manifests/sample-manifest.p5m b/components/libxslt/manifests/sample-manifest.p5m index 1218e063e..28a411473 100644 --- a/components/libxslt/manifests/sample-manifest.p5m +++ b/components/libxslt/manifests/sample-manifest.p5m @@ -1,16 +1,17 @@ # -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. +# Copyright 2018 # -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # - -# -# Copyright 2016 +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -67,20 +68,8 @@ file path=usr/lib/libxslt.so.$(COMPONENT_VERSION) link path=usr/lib/libxslt.so.1 target=libxslt.so.$(COMPONENT_VERSION) file path=usr/lib/pkgconfig/libexslt.pc file path=usr/lib/pkgconfig/libxslt.pc -file path=usr/lib/python2.7/vendor-packages/64/libxslt.py -file path=usr/lib/python2.7/vendor-packages/64/libxsltmod.so -file path=usr/lib/python2.7/vendor-packages/libxslt.py -file path=usr/lib/python2.7/vendor-packages/libxsltmod.so file path=usr/lib/xsltConf.sh file path=usr/share/aclocal/libxslt.m4 -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/TODO -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/basic.py -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/exslt.py -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/extelem.py -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/extfunc.py -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/pyxsltproc.py -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/test.xml -file path=usr/share/doc/libxslt-python-$(COMPONENT_VERSION)/examples/test.xsl file path=usr/share/lib/xslt/doc/html/API.html file path=usr/share/lib/xslt/doc/html/APIchunk0.html file path=usr/share/lib/xslt/doc/html/APIchunk1.html diff --git a/components/libxslt/mapfile.xslt b/components/libxslt/mapfile.xslt deleted file mode 100644 index b748f779e..000000000 --- a/components/libxslt/mapfile.xslt +++ /dev/null @@ -1,284 +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.5 { - global: - xsltMaxVars; - xsltFreeLocales; - xsltXPathCompileFlags; -} SUNW_1.4; - -SYMBOL_VERSION SUNW_1.4 { - global: - xsltCheckExtURI; - xsltExtensionInstructionResultFinalize; - xsltExtensionInstructionResultRegister; - xsltFreeLocale; - xsltInit; - xsltInitAllDocKeys; - xsltInitGlobals; - xsltLocaleStrcmp; - xsltLocalVariablePop; - xsltLocalVariablePush; - xsltNewLocale; - xsltRegisterLocalRVT; - xsltReleaseRVT; - xsltStrxfrm; - xsltUninit; -} SUNW_1.3; - -SYMBOL_VERSION SUNW_1.3 { - global: - xsltDocDefaultLoader; - xsltSetLoaderFunc; -} SUNW_1.2; - -SYMBOL_VERSION SUNW_1.2 { - global: - xsltAttrTemplateValueProcessNode; - xsltCheckRead; - xsltCheckWrite; - xsltCompileAttr; - xsltComputeSortResult; - xsltCopyTextString; - xsltCreateRVT; - xsltDebugGetDefaultTrace; - xsltDebugSetDefaultTrace; - xsltDefaultSortFunction; - xsltDefaultTrace; - xsltEvalAVT; - xsltEvalXPathStringNs; - xsltFreeAVTList; - xsltFreeRVTs; - xsltFreeSecurityPrefs; - xsltGetCNsProp; - xsltGetDebuggerStatus; - xsltGetDefaultSecurityPrefs; - xsltGetExtInfo; - xsltGetPlainNamespace; - xsltGetProfileInformation; - xsltGetQNameURI2; - xsltGetSecurityPrefs; - xsltGetUTF8Char; - xsltNewSecurityPrefs; - xsltNormalizeCompSteps; - xsltParseStylesheetImportedDoc; - xsltRegisterPersistRVT; - xsltRegisterTmpRVT; - xsltSecurityAllow; - xsltSecurityForbid; - xsltSetCtxtParseOptions; - xsltSetCtxtSecurityPrefs; - xsltSetCtxtSortFunc; - xsltSetDebuggerStatus; - xsltSetDefaultSecurityPrefs; - xsltSetSecurityPrefs; - xsltSetSortFunc; - xsltSetTransformErrorFunc; - xsltSplitQName; - xsltTransformError; - xsltXPathCompile; -} SUNW_1.1; - -SYMBOL_VERSION SUNW_1.1 { - global: - xslAddCall; - xslDropCall; - xslHandleDebugger; - xsltAddKey; - xsltAddStackElemList; - xsltAddTemplate; - xsltAllocateExtra; - xsltAllocateExtraCtxt; - xsltApplyAttributeSet; - xsltApplyImports; - xsltApplyOneTemplate; - xsltApplyStripSpaces; - xsltApplyStylesheet; - xsltApplyStylesheetUser; - xsltApplyTemplates; - xsltAttrListTemplateProcess; - xsltAttrTemplateProcess; - xsltAttrTemplateValueProcess; - xsltAttribute; - xsltCalibrateAdjust; - xsltCallTemplate; - xsltCheckExtPrefix; - xsltChoose; - xsltCleanupGlobals; - xsltCleanupTemplates; - xsltComment; - xsltCompilePattern; - xsltCopy; - xsltCopyNamespace; - xsltCopyNamespaceList; - xsltCopyOf; - xsltCopyTree; - xsltDebug; - xsltDebugDumpExtensions; - xsltDecimalFormatGetByName; - xsltDoSortFunction; - xsltDocumentComp; - xsltDocumentElem; - xsltDocumentFunction; - xsltDocumentSortFunction; - xsltElement; - xsltElementAvailableFunction; - xsltEvalAttrValueTemplate; - xsltEvalGlobalVariables; - xsltEvalOneUserParam; - xsltEvalStaticAttrValueTemplate; - xsltEvalTemplateString; - xsltEvalUserParams; - xsltEvalXPathPredicate; - xsltEvalXPathString; - xsltExtElementLookup; - xsltExtModuleElementLookup; - xsltExtModuleElementPreComputeLookup; - xsltExtModuleFunctionLookup; - xsltExtModuleTopLevelLookup; - xsltFindDocument; - xsltFindElemSpaceHandling; - xsltFindTemplate; - xsltForEach; - xsltFormatNumberConversion; - xsltFormatNumberFunction; - xsltFreeAttributeSetsHashes; - xsltFreeCompMatchList; - xsltFreeCtxtExts; - xsltFreeDocumentKeys; - xsltFreeDocuments; - xsltFreeExts; - xsltFreeGlobalVariables; - xsltFreeKeys; - xsltFreeNamespaceAliasHashes; - xsltFreeStackElemList; - xsltFreeStyleDocuments; - xsltFreeStylePreComps; - xsltFreeStylesheet; - xsltFreeTemplateHashes; - xsltFreeTransformContext; - xsltFunctionAvailableFunction; - xsltFunctionNodeSet; - xsltGenerateIdFunction; - xsltGetExtData; - xsltGetKey; - xsltGetNamespace; - xsltGetNsProp; - xsltGetQNameURI; - xsltGetSpecialNamespace; - xsltGetTemplate; - xsltGetXIncludeDefault; - xsltIf; - xsltInitCtxtExts; - xsltInitCtxtKeys; - xsltInitElemPreComp; - xsltIsBlank; - xsltKeyFunction; - xsltLoadDocument; - xsltLoadStyleDocument; - xsltLoadStylesheetPI; - xsltMessage; - xsltNamespaceAlias; - xsltNeedElemSpaceHandling; - xsltNewDocument; - xsltNewElemPreComp; - xsltNewStyleDocument; - xsltNewStylesheet; - xsltNewTransformContext; - xsltNextImport; - xsltNumber; - xsltNumberFormat; - xsltParseGlobalParam; - xsltParseGlobalVariable; - xsltParseStylesheetAttributeSet; - xsltParseStylesheetCallerParam; - xsltParseStylesheetDoc; - xsltParseStylesheetFile; - xsltParseStylesheetImport; - xsltParseStylesheetInclude; - xsltParseStylesheetOutput; - xsltParseStylesheetParam; - xsltParseStylesheetProcess; - xsltParseStylesheetVariable; - xsltParseTemplateContent; - xsltPreComputeExtModuleElement; - xsltPrintErrorContext; - xsltProcessOneNode; - xsltProcessingInstruction; - xsltProfileStylesheet; - xsltQuoteOneUserParam; - xsltQuoteUserParams; - xsltRegisterAllElement; - xsltRegisterAllExtras; - xsltRegisterAllFunctions; - xsltRegisterExtElement; - xsltRegisterExtFunction; - xsltRegisterExtModule; - xsltRegisterExtModuleElement; - xsltRegisterExtModuleFull; - xsltRegisterExtModuleFunction; - xsltRegisterExtModuleTopLevel; - xsltRegisterExtPrefix; - xsltRegisterExtras; - xsltRegisterTestModule; - xsltResolveStylesheetAttributeSet; - xsltRunStylesheet; - xsltRunStylesheetUser; - xsltSaveProfiling; - xsltSaveResultTo; - xsltSaveResultToFd; - xsltSaveResultToFile; - xsltSaveResultToFilename; - xsltSaveResultToString; - xsltSetDebuggerCallbacks; - xsltSetGenericDebugFunc; - xsltSetGenericErrorFunc; - xsltSetXIncludeDefault; - xsltShutdownCtxtExts; - xsltShutdownExts; - xsltSort; - xsltStyleGetExtData; - xsltStylePreCompute; - xsltSystemPropertyFunction; - xsltTemplateProcess; - xsltTestCompMatchList; - xsltText; - xsltTimestamp; - xsltUnparsedEntityURIFunction; - xsltUnregisterExtModule; - xsltUnregisterExtModuleElement; - xsltUnregisterExtModuleFunction; - xsltUnregisterExtModuleTopLevel; - xsltValueOf; - xsltVariableLookup; - xsltXPathFunctionLookup; - xsltXPathGetTransformContext; - xsltXPathVariableLookup; - xslDebugStatus; - xsltEngineVersion; - xsltExtMarker; - xsltGenericDebug; - xsltGenericDebugContext; - xsltGenericError; - xsltGenericErrorContext; - xsltLibxmlVersion; - xsltLibxsltVersion; - xsltMaxDepth; - local: - *; -}; -- 2.11.4.GIT