[Libreoffice-commits] core.git: 7 commits - android/Bootstrap configure.ac external/cairo external/curl external/lcms2 external/lpsolve redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk RepositoryExternal.mk RepositoryFixes.mk scp2/source solenv/gbuild

Michael Stahl mstahl at redhat.com
Wed Oct 23 15:29:38 PDT 2013 

 RepositoryExternal.mk                          |   42 ++++++++++++++++---------
 RepositoryFixes.mk                             |    2 -
 android/Bootstrap/Makefile.shared              |    6 +++
 configure.ac                                   |    5 ++
 external/cairo/ExternalPackage_cairo.mk        |    1 
 external/cairo/ExternalPackage_pixman.mk       |    1 
 external/curl/ExternalPackage_curl.mk          |   31 ++++--------------
 external/lcms2/ExternalPackage_lcms2.mk        |   16 ++++-----
 external/lpsolve/ExternalPackage_lpsolve.mk    |   22 ++-----------
 redland/ExternalPackage_raptor.mk              |   12 +------
 redland/ExternalPackage_rasqal.mk              |   12 +------
 redland/ExternalPackage_redland.mk             |   12 +------
 redland/ExternalProject_rasqal.mk              |    4 +-
 redland/ExternalProject_redland.mk             |    8 ++--
 scp2/source/ooo/file_library_ooo.scp           |    2 -
 solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk  |    2 -
 solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk |    2 -
 solenv/gbuild/platform/NETBSD_INTEL_GCC.mk     |    2 -
 solenv/gbuild/platform/NETBSD_X86_64_GCC.mk    |    2 -
 solenv/gbuild/platform/com_MSC_class.mk        |    4 +-
 solenv/gbuild/platform/macosx.mk               |    5 +-
 solenv/gbuild/platform/mingw.mk                |    3 +
 solenv/gbuild/platform/solaris.mk              |    5 +-
 solenv/gbuild/platform/unxgcc.mk               |    4 +-
 24 files changed, 88 insertions(+), 117 deletions(-)

New commits:
commit 77fe50b0f674253f390796f5d9bbf367c443f0da
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 23:35:16 2013 +0200

    cppunit: use libraries from WORKDIR
    
    Change-Id: I5ce895e6cadc874a3464e6109dfbedd785dbac77

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58020c4..968d326 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -199,14 +199,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
 define gb_LinkTarget__use_cppunit
 $(call gb_LinkTarget_use_package,$(1),cppunit)
 
-$(call gb_LinkTarget_use_libraries,$(1),\
-    cppunit \
-)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,cppunit/include)\
 	$$(INCLUDE) \
 )
 
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,cppunit)/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib) \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,cppunit)/src/cppunit/.libs -lcppunit \
+)
+endif
+
 endef
 
 endif
diff --git a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
index c1b2c3f..670f198 100644
--- a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
@@ -14,6 +14,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
index 4829c7b..f7f1c4b 100644
--- a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
@@ -13,6 +13,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index e95c796..93e4dd9 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -17,6 +17,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index 684cbd2..c1aee6b9 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -16,6 +16,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 8e00102..cd43a72 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -387,7 +387,7 @@ endef
 gb_CppunitTest_DEFS := -D_DLL
 # cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin,
 # thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(shell cygpath -w $(gb_Library_DLLDIR))"
+gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(shell cygpath -w $(gb_Library_DLLDIR)):$(shell cygpath -w $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))"
 
 gb_CppunitTest_get_filename = test_$(1).dll
 gb_CppunitTest_get_ilibfilename = itest_$(1).lib
@@ -435,7 +435,7 @@ endef
 
 # PythonTest class
 
-gb_PythonTest_PRECOMMAND := $(gb_Helper_set_ld_path)
+gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND)
 
 # SrsPartTarget class
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e5e9d13..3408dce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -278,7 +278,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(gb_Library_DLLDIR)"
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+    $(call gb_Helper_extend_ld_path,$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).dylib
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
 
@@ -315,7 +316,7 @@ gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY
 ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER))
 gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_FOLDER)
 endif
-gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib
+gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs
 
 # Module class
 
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index acdf23c..29ac9c4 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -279,7 +279,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+    $(call gb_Helper_extend_ld_path,$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = test_$(1).dll
 gb_CppunitTest_get_ilibfilename = itest_$(1).lib
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index e0f7055..295fce6 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -301,7 +301,7 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_CPPTESTPRECOMMAND := \
-    $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
+    $(call gb_Helper_extend_ld_path,$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).so
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
 
@@ -338,8 +338,7 @@ endef
 
 # PythonTest class
 
-#TODO:
-gb_PythonTest_PRECOMMAND :=
+gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND)
 
 # Module class
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a6f4f62..81137a3 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -300,7 +300,7 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_CPPTESTPRECOMMAND := \
-    $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
+    $(call gb_Helper_extend_ld_path,$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).so
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
 
@@ -337,7 +337,7 @@ endef
 
 # PythonTest class
 
-gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(INSTROOT)/$(LIBO_URE_LIB_FOLDER):$(INSTROOT)/$(LIBO_LIB_FOLDER):$(OUTDIR)/lib
+gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND)
 
 # Module class
 
commit 936a1a9daf5d7feb4e1ebe0a2ab237f21c7bdc85
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 22:37:11 2013 +0200

    curl: use libraries from WORKDIR
    
    Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fe87668..58020c4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1931,9 +1931,16 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,curl/include) \
 	$$(INCLUDE) \
 )
+
+ifeq ($(COM),MSC)
 $(call gb_LinkTarget_use_libraries,$(1),\
-	curl \
+	$(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl.lib \
 )
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,curl)/lib/.libs -lcurl \
+)
+endif
 
 endef
 
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index d5af717..0d1bfc1 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -88,6 +88,7 @@ LIBS = \
   $(HUNSPELL_LIBS) \
   $(HYPHEN_LIB) \
   $(MYTHES_LIBS) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index e9cb7a1..9766766 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -11,33 +11,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl))
 
 $(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
 
-ifneq ($(OS),WNT)
+ifneq ($(DISABLE_DYNLOADING),TRUE)
 
-ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.pc))
-endif
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a))
-else ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so))
+ifeq ($(OS)$(COM),WNTGCC)
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
+else ifeq ($(COM),MSC)
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll))
 else ifeq ($(OS),AIX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
 $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
 endif
 
-else ifeq ($(OS)$(COM),WNTGCC)
-
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a))
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
-
-else ifeq ($(COM),MSC)
-
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib))
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll))
-
-endif
+endif # $(DISABLE_DYNLOADING)
 
 # vim: set noet sw=4 ts=4:
commit 30e1d4c0a9202d5c8057efdb0bfda11f46a25251
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 22:20:25 2013 +0200

    curl: libcurl.so.4 goes into instset, not libcurl.so!
    
    Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file
    is not actually in the instset, just a libcurl.so with SONAME
    libcurl.so.4.
    
    (regression in LO 4.0.0)
    
    Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f

diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 5f55260..e9cb7a1 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -24,10 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.
 else ifeq ($(OS),AIX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
 else
-# TODO: Do we really want the unversioned library in the installation?
-# And if that's true, why do we need to deliver the versioned one at all?
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
 endif
 
 else ifeq ($(OS)$(COM),WNTGCC)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3bf6ec9..d8245c9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -92,7 +92,7 @@ File gid_File_Lib_Curl
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
     #endif
   #else
    #ifdef _gcc3
commit 25f65f26a25e1ca275e54b9f62c45c7e872adec9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 22:04:36 2013 +0200

    lcms2: use libraries from WORKDIR
    
    Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0ff4f74..fe87668 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1662,9 +1662,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_libraries,$(1),\
-	lcms2 \
-)
+$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
 
 endef
 
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 726ba42..b648aa5 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -117,11 +117,11 @@ gb_Library_ILIBFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_ILIBFILENAMES))
 
 gb_Library_NOILIBFILENAMES_D := \
     icudt icuin icuuc \
-    lcms2 \
 
 # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
 gb_Library_NOILIBFILENAMES := \
     langtag \
+    lcms2 \
     lpsolve55 \
     xpcom \
     xpcom_core \
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 77995be..d5af717 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -89,6 +89,7 @@ LIBS = \
   $(HYPHEN_LIB) \
   $(MYTHES_LIBS) \
   $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \
diff --git a/configure.ac b/configure.ac
index 6e59d12..ad72a5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7791,10 +7791,13 @@ if test "$with_system_lcms2" = "yes"; then
 else
     SYSTEM_LCMS2=NO
 fi
-libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/lcms2/include"],["-L${OUTDIR}/lib -llcms2"])
+libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/lcms2/include"],["-L${WORKDIR}/UnpackedTarball/lcms2/src/.libs -llcms2"])
 if test "$GCC" = "yes"; then
     LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long"
 fi
+if test "$COM" = "MSC"; then # override the above
+    LCMS2_LIBS=${WORKDIR}/UnpackedTarball/lcms2/bin/lcms2.lib
+fi
 
 dnl ===================================================================
 dnl Check for system cppunit
diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk
index 395be9a..4d1c98e 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -8,25 +8,23 @@
 #
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
+
 $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
 
+ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.dylib))
 $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
-else ifeq ($(filter-out IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a))
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a))
 $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2.lib))
 # note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
 # actually called LCMS2D.DLL then
 $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
-endif
-else
-$(eval $(call gb_ExternalPackage_add_symbolic_link,lcms2,lib/liblcms2.so,liblcms2.so.2))
+endif # $(COM)
+else  # $(OS) != WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
-endif
+endif # $(OS)
+endif # $(DISABLE_DYNLOADING)
+
 # vim: set noet sw=4 ts=4:
commit b177b3067539f6c80f223b08ec772b174e721e8e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 21:33:51 2013 +0200

    lpsolve: use libraries from WORKDIR
    
    Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4d5ce18..0ff4f74 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1690,8 +1690,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 
 define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
-$(call gb_LinkTarget_use_libraries,$(1),\
-	lpsolve55 \
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55 -llpsolve55 \
 )
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,lpsolve) \
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index e1d3113..77995be 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -96,6 +96,7 @@ LIBS = \
   $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/lpsolve/lpsolve55/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \
diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk
index 70bfa67..663b247 100644
--- a/external/lpsolve/ExternalPackage_lpsolve.mk
+++ b/external/lpsolve/ExternalPackage_lpsolve.mk
@@ -8,29 +8,17 @@
 #
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
+
 $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
 
+ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-ifneq ($(OS_FOR_BUILD),WNT)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
-endif # $(OS_FOR_BUILD)
-else # $(COM)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
-endif # $(COM)
 $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,bin/lpsolve55.dll,lpsolve55/lpsolve55.dll))
-else # $(OS)
-
-ifeq ($(OS),MACOSX)
+else ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib))
-else
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a))
-else
+else # $(OS) != WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.so,lpsolve55/liblpsolve55.so))
-endif # $(DISABLE_DYNLOADING)
-
-endif # $(OS)
 endif # $(OS)
+endif # $(DISABLE_DYNLOADING)
 
 # vim: set noet sw=4 ts=4:
commit d89f48b43cae00be567c3f33bb276e12ca8959b2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 21:27:05 2013 +0200

    cairo: use libraries from WORKDIR
    
    Change-Id: Ieb28a48c5fe3b0d89261ff790ecc9db2b5bbf21c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eee3d1e..4d5ce18 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1034,10 +1034,10 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_libraries,$(1),\
-	cairo \
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
 	$(if $(filter-out MACOSX WNT,$(OS)), \
-		pixman-1 \
+		-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
 	) \
 )
 
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk
index 9be4caa..83c0bd5 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
 
 $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
 
-$(eval $(call gb_ExternalPackage_add_file,cairo,lib/libcairo.so,src/.libs/libcairo.so.2.11000.2))
 $(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk
index 3ce67f5..0e342c82 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman))
 
 $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
 
-$(eval $(call gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so,pixman/.libs/libpixman-1.so.0.24.4))
 $(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
 
 # vim: set noet sw=4 ts=4:
commit 2793c546dc3bb1ea0f187bd79b33f77fd3df5afb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 21:18:24 2013 +0200

    redland: use libraries from WORKDIR
    
    Change-Id: Ief9a38cbef7552e94ce4ad01fa363a29654bdf9e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6f1b306..eee3d1e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -985,9 +985,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 
 define gb_LinkTarget__use_librdf
 $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
-$(call gb_LinkTarget_use_libraries,$(1),\
-	raptor2 \
-	rdf \
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
+	-L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \
 )
 
 endef
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index ece8594..e1d3113 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -97,6 +97,9 @@ LIBS = \
   $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \
   -Wl,--end-group
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index ee9cfb1..1382e4f 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -13,18 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,raptor,lib/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib))
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib))
-else ifneq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a))
-else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.dll.a,src/.libs/libraptor2.dll.a))
+else ifeq ($(OS)-$(COM),WNT-GCC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll))
-else ifneq ($(filter WNT,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a))
+else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2.dll,src/.libs/libraptor2.dll))
-else
+else ifeq ($(filter IOS ANDROID,$(OS)),)
 $(eval $(call gb_ExternalPackage_add_library_for_install,raptor,lib/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.so,src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index 43329b5..d5d2651 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -13,18 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,lib/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib))
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib))
-else ifneq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
-else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dll.a,src/.libs/librasqal.dll.a))
+else ifeq ($(OS)-$(COM),WNT-GCC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll))
-else ifneq ($(filter WNT,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
+else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll))
-else
+else ifeq ($(filter IOS ANDROID,$(OS)),)
 $(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,lib/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk
index e1c8c60..83c2f8b 100644
--- a/redland/ExternalPackage_redland.mk
+++ b/redland/ExternalPackage_redland.mk
@@ -13,18 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,redland,redland))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,redland,lib/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
-else ifneq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a))
-else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dll.a,src/.libs/librdf.dll.a))
+else ifeq ($(OS)-$(COM),WNT-GCC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll))
-else ifneq ($(filter WNT,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a))
+else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf.dll,src/.libs/librdf.dll))
-else
+else ifeq ($(filter IOS ANDROID,$(OS)),)
 $(eval $(call gb_ExternalPackage_add_library_for_install,redland,lib/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.so,src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 9277d07..6d09cfe 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
-		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
+		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \
 		./configure --disable-static --enable-shared --disable-gtk-doc \
 			--disable-pcre \
 			--with-decimal=none \
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 		$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
-		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
+		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \
 		./configure --disable-gtk-doc \
 			--with-regex-library=posix \
 			--with-decimal=none \
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index fe911bc..e4a98dc 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -28,10 +28,10 @@ $(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 \
+		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -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" \
+		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
 		./configure --disable-static --disable-gtk-doc \
 			--disable-modular \
 			--without-threads \
@@ -51,10 +51,10 @@ $(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  \
+		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -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" \
+		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
 		./configure --disable-gtk-doc \
 			--disable-modular \
 			--without-threads \

More information about the Libreoffice-commits mailing list