diff options
| -rw-r--r-- | filter/Library_xsltfilter.mk | 1 | ||||
| -rw-r--r-- | libxslt/libxsltversion.mk | 3 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 1 | ||||
| -rw-r--r-- | libxslt/prj/d.lst | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 18 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 11 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
7 files changed, 38 insertions, 4 deletions
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 9688d59c79d8..94fca8145310 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ $(eval $(call gb_Library_use_externals,xsltfilter,\ libxml2 \ libxslt \ + libexslt \ )) $(eval $(call gb_Library_add_exception_objects,xsltfilter,\ diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk index c80c0e9535b0..e7fe5e5af7c3 100644 --- a/libxslt/libxsltversion.mk +++ b/libxslt/libxsltversion.mk @@ -26,8 +26,11 @@ #************************************************************************* # major LIBXSLT_MAJOR=1 +LIBEXSLT_MAJOR=0 # minor LIBXSLT_MINOR=1 +LIBEXSLT_MINOR=8 # micro LIBXSLT_MICRO=26 +LIBEXSLT_MICRO=15 diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 670ebb952219..9d4deffec4ac 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -159,6 +159,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ENDIF OUT2INC=libxslt$/*.h +OUT2INC+=libexslt$/*.h .IF "$(OS)"=="MACOSX" OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index f3613b0c0d57..892df7b3b1a8 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -1,5 +1,7 @@ mkdir: %_DEST%\inc\external\libxslt +mkdir: %_DEST%\inc\external\libexslt ..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h +..\%__SRC%\inc\exslt*.h %_DEST%\inc\external\libexslt\*.h ..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib ...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 928174b6169e..8a20d0735632 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1470,6 +1470,24 @@ File gid_File_Lib_Xslt #endif #endif End +File gid_File_Lib_eXslt + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + #ifdef MACOSX + Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX)); + #else + Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0)); + #endif + #else + #ifdef _gcc3 + Name = "libexslt-0.dll"; + #else + Name = "libexslt.dll"; + #endif + #endif +End #endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 26ec6d6556c9..aa4ff72b2583 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -70,6 +70,13 @@ Unixlink gid_Unixlink_File_Lib_Xslt Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1)); End +Unixlink gid_Unixlink_File_Lib_eXslt + BIN_FILE_BODY; + Dir = SCP2_OOO_BIN_DIR; + Name = STRING(CONCAT2(libexslt,UNXSUFFIX)); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0)); +End #endif #endif @@ -431,6 +438,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ucppkg1, gid_File_Lib_Xslt, gid_Unixlink_File_Lib_Xslt, + gid_Unixlink_File_Lib_eXslt, gid_File_Lib_LibXMLSec_xmlsecnss, gid_File_Lib_LibXMLSec_xmlseccore, gid_File_Lib_LibXMLSec_xmlsecmscrypto, @@ -499,7 +507,8 @@ Module gid_Module_Root_Files_5 gid_Unixlink_File_Lib_Raptor, gid_Unixlink_File_Lib_Rasqal, gid_Unixlink_File_Lib_Rdf, - gid_Unixlink_File_Lib_Xslt); + gid_Unixlink_File_Lib_Xslt, + gid_Unixlink_File_Lib_eXslt); End Module gid_Module_Root_Files_6 diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1efcd2226db6..b9e2a5df464e 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -252,9 +252,9 @@ CPPUNITLIB = $(CPPUNIT_LIBS) CPPUNITLIB = -lcppunit .ENDIF .IF "$(SYSTEM_LIBXSLT)"=="YES" -XSLTLIB=$(LIBXSLT_LIBS) +XSLTLIB=$(LIBEXSLT_LIBS) .ELSE -XSLTLIB=-lxslt $(LIBXML2LIB) +XSLTLIB=-lexslt -lxslt $(LIBXML2LIB) .ENDIF JVMFWKLIB = -ljvmfwk .IF "$(SYSTEM_REDLAND)"=="YES" @@ -491,7 +491,7 @@ PKGCHKLIB=ipkgchk.lib HELPLINKERLIB=ihelplinker.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = icppunit_dll.lib -XSLTLIB = libxslt.lib $(LIBXML2LIB) +XSLTLIB = libexslt.lib libxslt.lib $(LIBXML2LIB) REDLANDLIB = librdf.lib JVMFWKLIB = ijvmfwk.lib |