RepositoryExternal.mk | 49 +++++++++++++++++++------ external/firebird/ExternalPackage_firebird.mk | 4 -- external/liblangtag/ExternalProject_langtag.mk | 7 ++- external/libxml2/ExternalPackage_xml2.mk | 19 +-------- external/libxml2/libxml2-configure.patch | 6 +-- external/libxslt/ExternalPackage_xslt.mk | 24 +----------- external/libxslt/ExternalProject_xslt.mk | 3 + external/libxslt/libxslt-configure.patch | 8 ++-- include/postmac.h | 1 include/postx.h | 5 -- include/premac.h | 1 include/prex.h | 4 -- libxmlsec/ExternalProject_xmlsec.mk | 3 + redland/ExternalProject_redland.mk | 6 ++- sc/source/filter/excel/xecontent.cxx | 12 +++--- sc/source/filter/inc/xecontent.hxx | 7 +-- sfx2/source/doc/graphhelp.cxx | 10 ----- solenv/gbuild/ExternalExecutable.mk | 3 + vcl/unx/generic/gdi/salgdi.cxx | 6 +-- 19 files changed, 76 insertions(+), 102 deletions(-)
New commits: commit 4c3b1dc1a10952288e3f0886fc638ee48454a9ad Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 22:13:13 2013 +0200 postx.h: BYTE, BOOL, INT8, INT64 should no longer cause problems Change-Id: Ifd5e918028c15c4b2b61ff1612ae27ed96f45d3b diff --git a/include/postx.h b/include/postx.h index 88699c0..ff5228a 100644 --- a/include/postx.h +++ b/include/postx.h @@ -26,10 +26,6 @@ /* X Types */ #undef Window -#undef BYTE -#undef INT8 -#undef INT64 -#undef BOOL #undef Font #undef Cursor #undef KeyCode commit 4853cd4991c4f27d3bbfb8dbbcc5f2c4b84ee6b0 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 22:08:39 2013 +0200 vcl: convert some BOOL to sal_uInt8 Change-Id: Ib0d90de832bc8006eaa62b55abb416e2d19b4782 diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index eacd35b..feba94a 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -928,18 +928,18 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, drawPolyLine( pPoints[i], pPtAry[i], true ); } -sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const BYTE* ) +sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } -sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const BYTE* ) +sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, - const SalPoint* const*, const BYTE* const* ) + const SalPoint* const*, const sal_uInt8* const* ) { return sal_False; } commit 93f9f1bfd10560882380970603aa934955598053 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 21:53:01 2013 +0200 sfx2: remove obsolete redefinitions of Win32 UINT64 etc. types Change-Id: I6b7acb44c16bcf4d3f8bcc338cb785fb7262eae6 diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 2bf194a..2b7ea66 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -23,11 +23,6 @@ #undef WB_LEFT #undef WB_RIGHT -#define UINT64 USE_WIN_UINT64 -#define INT64 USE_WIN_INT64 -#define UINT32 USE_WIN_UINT32 -#define INT32 USE_WIN_INT32 - #include <tools/presys.h> #if defined _MSC_VER #pragma warning(push, 1) @@ -38,11 +33,6 @@ #endif #include <tools/postsys.h> -#undef UINT64 -#undef INT64 -#undef UINT32 -#undef INT32 - #endif #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> commit 1bfbb58082f9b600110b4a7b7510fbd8d35fc3d4 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 21:40:11 2013 +0200 premac.h: remove StringPtr mangling Change-Id: I94f5331fd00602778421ff6ba5f96cf2366cf1da diff --git a/include/postmac.h b/include/postmac.h index f157e67..bc16849 100644 --- a/include/postmac.h +++ b/include/postmac.h @@ -35,7 +35,6 @@ #undef Region #undef SetCursor #undef Size -#undef StringPtr #undef TimeValue /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/premac.h b/include/premac.h index 3f3f9b2..e67b315 100644 --- a/include/premac.h +++ b/include/premac.h @@ -35,7 +35,6 @@ #define Region MacOSRegion #define SetCursor MacOSSetCursor #define Size MacOSSize -#define StringPtr MacOSStringPtr #define TimeValue MacOSTimeValue /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit eeffa03b51efaaa6361ef876bffa476e31598002 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 21:39:55 2013 +0200 prex.h: remove String mangling Change-Id: Idb74e75b4f3e499eb4a633605600f639fb87b728 diff --git a/include/postx.h b/include/postx.h index 7bce135..88699c0 100644 --- a/include/postx.h +++ b/include/postx.h @@ -32,7 +32,6 @@ #undef BOOL #undef Font #undef Cursor -#undef String #undef KeyCode #undef Region #undef Icon diff --git a/include/prex.h b/include/prex.h index a37433d..fec9c62 100644 --- a/include/prex.h +++ b/include/prex.h @@ -30,7 +30,6 @@ #define Boolean HIDE_XLIB_Boolean #define Font HIDE_XLIB_Font #define Icon HIDE_XLIB_Icon -#define String HIDE_XLIB_String /* Types from <X11/X.h> that clash, but we do use. */ #define Cursor XLIB_Cursor @@ -53,9 +52,6 @@ extern "C" { /* From <X11/Intrinsic.h> */ typedef unsigned long Pixel; -#undef String -#define String XLIB_String - #undef KeyCode #define KeyCode XLIB_KeyCode //undef in intrinsics commit 3e11d7a6b89ed426257c1faa80fee08c97c2e388 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 21:37:35 2013 +0200 sc: remove StringPtr type, just use OUString directly Change-Id: I2e74afb0c5bdd4d980feb43500117e731cdf578e diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 9132b48..35ad9b2 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -350,7 +350,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU aXclStrm << sal_uInt16( 0 ); mnFlags |= EXC_HLINK_DESCR; - mxRepr.reset( new OUString( rRepr ) ); + m_Repr = rRepr; } // file link or URL @@ -387,8 +387,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU << sal_uInt16( 0x0003 ); aLink.WriteBuffer( aXclStrm ); // NO flags - if( !mxRepr.get() ) - mxRepr.reset( new OUString( aFileName ) ); + if (m_Repr.isEmpty()) + m_Repr = aFileName; msTarget = XclXmlUtils::ToOUString( aLink ); // ooxml expects the file:/// part appended ( or at least @@ -404,8 +404,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU aXclStrm << sal_uInt16( 0 ); mnFlags |= EXC_HLINK_BODY | EXC_HLINK_ABS; - if( !mxRepr.get() ) - mxRepr.reset( new OUString( rUrl ) ); + if (m_Repr.isEmpty()) + m_Repr = rUrl; msTarget = XclXmlUtils::ToOUString( aUrl ); } @@ -513,7 +513,7 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm ) ? XclXmlUtils::ToOString( *mxTextMark ).getStr() : NULL, // OOXTODO: XML_tooltip, from record HLinkTooltip 800h wzTooltip - XML_display, XclXmlUtils::ToOString( *mxRepr ).getStr(), + XML_display, XclXmlUtils::ToOString(m_Repr).getStr(), FSEND ); } diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 8c0386f7..81ed8e8 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -104,7 +104,7 @@ public: virtual ~XclExpHyperlink(); /** Returns the cell representation text or 0, if not available. */ - inline const OUString* GetRepr() const { return mxRepr.get(); } + inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? 0 : &m_Repr; } virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -121,14 +121,13 @@ private: virtual void WriteBody( XclExpStream& rStrm ); private: - typedef boost::scoped_ptr< OUString > StringPtr; typedef boost::scoped_ptr< SvStream > SvStreamPtr; ScAddress maScPos; /// Position of the hyperlink. - StringPtr mxRepr; /// Cell representation text. + OUString m_Repr; /// Cell representation text. SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags; /// Option flags. - XclExpStringRef mxTextMark; /// Location within mxRepr + XclExpStringRef mxTextMark; /// Location within m_Repr OUString msTarget; /// Target URL }; commit e6c47b03d06d2e0c4b924baaf00d9a2412dc40e2 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 18:47:56 2013 +0200 libxml2, libxslt: use executables from WORKDIR Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a01bc5c..d43be9f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3032,7 +3032,8 @@ gb_ExternalExecutable__register_xmllint := else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint -$(call gb_ExternalExecutable_set_internal,xmllint,$(OUTDIR_FOR_BUILD)/bin/xmllint$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_add_dependencies,xmllint,$(call gb_Package_get_target,xml2)) endef @@ -3045,7 +3046,7 @@ gb_ExternalExecutable__register_xsltproc := else # ! SYSTEM_LIBXSLT_FOR_BUILD define gb_ExternalExecutable__register_xsltproc -$(call gb_ExternalExecutable_set_internal,xsltproc,$(OUTDIR_FOR_BUILD)/bin/xsltproc$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt)) endef diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index a89e4a5..69a6e88 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -11,28 +11,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2)) $(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2)) -ifneq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xml2-config,xml2-config)) -endif - +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) -ifneq ($(CROSS_COMPILING),YES) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) -endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,.libs/xmllint.exe)) else # COM=MSC $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif +endif # DISABLE_DYNLOADING # vim: set noet sw=4 ts=4: diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index d91b509..d645ed3 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -11,32 +11,22 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt)) $(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt)) -ifneq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xslt-config,xslt-config)) -endif - +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) -ifneq ($(CROSS_COMPILING),YES) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc)) -endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,xsltproc/.libs/xsltproc.exe)) else # COM=MSC $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) endif +endif # DISABLE_DYNLOADING # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index 0d2a8cc..770dd3a 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -111,9 +111,10 @@ endef # FIXME need to subst in some more $$ in gb_Helper_set_ld_path here - ugly # but other uses (gb_CppunitTest_CPPTESTPRECOMMAND) require less $$ - ugly +# FIXME hack to avoid dependency into workdir - those must be added explicitly define gb_ExternalExecutable__set_internal gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) -gb_ExternalExecutable_$(1)_DEPENDENCIES := $(2) +gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring $(WORKDIR_FOR_BUILD),$(2)),,$(2)) gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path)) endef commit c03ff5ebc0f008825e45285f7c4021329bd60c05 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 18:02:28 2013 +0200 libxml2, libxslt: use libraries from WORKDIR Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4eadf2f..a01bc5c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -760,14 +760,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ define gb_LinkTarget__use_libxml2 $(call gb_LinkTarget_use_package,$(1),xml2) -$(call gb_LinkTarget_use_libraries,$(1),\ - xml2 \ -) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,xml2)/include \ ) +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc/libxml2.lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2 \ +) +endif + endef define gb_ExternalProject__use_libxml2 $(call gb_ExternalProject_use_package,$(1),xml2) @@ -811,9 +818,16 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,xslt) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - xslt \ + +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libxslt.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,xslt)/libxslt/.libs -lxslt \ +) +endif endef @@ -824,9 +838,15 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,xslt) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - exslt \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libexslt.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,xslt)/libexslt/.libs -lexslt \ +) +endif endef diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 23619ed..b4f17ce 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -26,9 +26,10 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ - $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ - LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(OUTDIR)/lib -llibxml2","-L$(gb_Helper_OUTDIRLIBDIR) -lxml2"),\ - $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),\ + LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ + LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2"),\ + $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index cbd06b2..a89e4a5 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -17,26 +17,21 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.dylib,.libs/libxml2.2.dylib)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) else ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.a,.libs/libxml2.a)) ifneq ($(CROSS_COMPILING),YES) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.dll.a,.libs/libxml2.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,.libs/xmllint.exe)) else # COM=MSC -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.lib,win32/bin.msvc/libxml2.lib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll,xml2)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.so,.libs/libxml2.so.2.7.6)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif diff --git a/external/libxml2/libxml2-configure.patch b/external/libxml2/libxml2-configure.patch index d851501..731308e 100644 --- a/external/libxml2/libxml2-configure.patch +++ b/external/libxml2/libxml2-configure.patch @@ -97,10 +97,10 @@ +#includedir=@includedir@ +#libdir=@libdir@ + -+prefix=${SOLARVERSION}/${INPATH} -+exec_prefix=${SOLARVERSION}/${INPATH} ++prefix=${WORKDIR}/UnpackedTarball/xml2 ++exec_prefix=${WORKDIR}/UnpackedTarball/xml2 +includedir=${WORKDIR}/UnpackedTarball/xml2/include -+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} ++libdir=${WORKDIR}/UnpackedTarball/xml2/.libs usage() { diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 909405e..d91b509 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -17,35 +17,25 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dylib,libxslt/.libs/libxslt.1.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.dylib,libexslt/.libs/libexslt.0.dylib)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) else ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.a,libxslt/.libs/libxslt.a)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.a,libexslt/.libs/libexslt.a)) ifneq ($(CROSS_COMPILING),YES) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc)) endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dll.a,libxslt/.libs/libxslt.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.dll.a,libexslt/.libs/libexslt.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,xsltproc/.libs/xsltproc.exe)) else # COM=MSC -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.lib,win32/bin.msvc/libxslt.lib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.lib,win32/bin.msvc/libexslt.lib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so,libxslt/.libs/libxslt.so.1.1.26)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so,libexslt/.libs/libexslt.so.0.8.15)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) endif diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index fa13770..3243fee 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) @@ -48,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ $(if $(filter IOS,$(OS)),LIBS="-liconv") \ --disable-shared,--disable-static) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \ && chmod 777 xslt-config \ && $(MAKE) \ ) diff --git a/external/libxslt/libxslt-configure.patch b/external/libxslt/libxslt-configure.patch index 6b189df..37b86cc 100644 --- a/external/libxslt/libxslt-configure.patch +++ b/external/libxslt/libxslt-configure.patch @@ -57,13 +57,13 @@ +#includedir=@includedir@ +#libdir=@libdir@ + -+prefix=${SOLARVERSION}/${INPATH} -+exec_prefix=${SOLARVERSION}/${INPATH} ++prefix=${WORKDIR}/UnpackedTarball/xslt ++exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc exec_prefix_set=no -includedir=@includedir@ -libdir=@libdir@ -+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external -+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} ++includedir=${WORKDIR}/UnpackedTarball/xslt/libxslt ++libdir=${WORKDIR}/UnpackedTarball/xslt/libxslt/.libs usage() { diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 93a1b07..7a0fcb6 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -39,6 +39,7 @@ else $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_run,build,\ cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \ + lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ @@ -58,7 +59,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(gb_Helper_OUTDIRLIBDIR) -lxml2")\ + $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \ && $(MAKE) \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 927e8f5..fe911bc 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -28,7 +28,8 @@ $(call gb_ExternalProject_get_state_target,redland,build): OBJDUMP="$(HOST_PLATFORM)-objdump" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ + RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 \ + $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \ ./configure --disable-static --disable-gtk-doc \ @@ -50,7 +51,8 @@ $(call gb_ExternalProject_get_state_target,redland,build): CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ + RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 \ + $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \ ./configure --disable-gtk-doc \ commit 37563db622eef1bf13fe78b21507fba033586560 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 22:22:49 2013 +0200 firebird: use libraries from WORKDIR Change-Id: I6dce79824c1b138226f5661878442275df6aff58 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 37d0a34..4eadf2f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2140,9 +2140,15 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - fbembed \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/bin/ifbembed.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/lib -lfbembed \ +) +endif endef diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 489171a..bc37b39 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -13,12 +13,10 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) ifeq ($(OS)-$(COM),WNT-MSC) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) else $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) endif # vim: set noet sw=4 ts=4: commit 03e9845525037a02dac320ad09fb6eed34e9f0da Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 22 22:15:42 2013 +0200 firebird: fix typo in b0f00d38254eca70e196e1580faac4a215bc2b12 Change-Id: I824721abeecfbd6d9592e00f73f6ef4b6e6d54ac diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 6eaaf1c..489171a 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -15,7 +15,7 @@ ifeq ($(OS)-$(COM),WNT-MSC) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_library_for_intsall,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) +$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) else $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits