lcms2: use libraries from WORKDIR

Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5

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
 

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 \

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) \

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

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: