[PATCH] Create liblcms2.so as a real library in solver.

[Matúš Kukan (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3972

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/3972/1

Create liblcms2.so as a real library in solver.

There was just a broken symbolic link
liblcms2.so.2 -> liblcms2.so.4 in installation.

Change-Id: I7a3c8f08a33c8971d9beb5fa06c706b25165b6d0
---
M RepositoryExternal.mk
M lcms2/ExternalPackage_lcms2.mk
M scp2/source/ooo/file_library_ooo.scp
3 files changed, 4 insertions(+), 11 deletions(-)



diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2762e4c..7ce4f66 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1643,18 +1643,14 @@
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	lcms2 \
-))
-
 define gb_LinkTarget__use_lcms2
 $(call gb_LinkTarget_use_package,$(1),lcms2)
 $(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),\
+	-llcms2 \
 )
 
 endef
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index 790c590..a945549 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -26,9 +26,6 @@
 $(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_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
-# NOTE: this is a symlink
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2))
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
+$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so.2.0.4))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 03243b8..d0a4186 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -378,7 +378,7 @@
     #ifdef MACOSX
        Name = STRING(CONCAT3(liblcms2,.2,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(liblcms2,UNXSUFFIX,.2));
+       Name = STRING(CONCAT2(liblcms2,UNXSUFFIX));
     #endif
   #elif defined(WNT)
     #ifdef _gcc3

-- 
To view, visit https://gerrit.libreoffice.org/3972
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a3c8f08a33c8971d9beb5fa06c706b25165b6d0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>