mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix lcms2 library in solver

Browse Source 
This commit repairs broken link liblcms2.so -> liblcms2.so.2.0.4 as
liblcms2.so -> liblcms2.so.2.

Change-Id: Idccd65bba5cec822d285859f609e222c84f2fad9
This commit is contained in:
Matúš Kukan
2013-09-10 01:04:39 +02:00
parent be4d2cdc23
commit 1ea33a8cfc
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lcms2/ExternalPackage_lcms2.mk
View File

@@ -26,7 +26,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_R
$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
endif endif
else else
$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) $(eval $(call gb_ExternalPackage_add_symbolic_link,lcms2,lib/liblcms2.so,liblcms2.so.2))
$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

5
solenv/gbuild/ExternalPackage.mk
View File

@@ -102,6 +102,11 @@ $(foreach file,$(2),$(call gb_ExternalProject_mark_generated_file,$(1),$(file)))
endef endef
define gb_ExternalPackage_add_symbolic_link
$(call gb_Package_add_symbolic_link,$(1),$(2),$(3))
endef
# Add a file # Add a file
# #
# See gb_Package_add_file for details. # See gb_Package_add_file for details.