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

Fix some thinkos or copy-paste mistakes for glyphy

Browse Source 
Change-Id: Ie008086c2a34081c9f50a61808b73b66eda58e2c
This commit is contained in:
Tor Lillqvist
2015-11-02 18:14:10 +02:00
parent 8311c6ed49
commit 4817f7f877
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RepositoryExternal.mk
View File

@@ -272,14 +272,14 @@ endef
endif # SYSTEM_GLEW endif # SYSTEM_GLEW
$(eval $(call gb_Helper_register_packages_for_install,ooo,\ ifneq ($(SYSTEM_GLYPHY),)
liborcus \
))
ifneq ($(SYSTEM_GLEW),)
else # !SYSTEM_GLYPHY else # !SYSTEM_GLYPHY
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
glyphy \
))
define gb_LinkTarget__use_glyphy define gb_LinkTarget__use_glyphy
$(call gb_LinkTarget_use_package,$(1),glyphy) $(call gb_LinkTarget_use_package,$(1),glyphy)
@@ -294,7 +294,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef endef
endif GLYPHY endif # SYSTEM_GLYPHY
define gb_LinkTarget__use_iconv define gb_LinkTarget__use_iconv
$(call gb_LinkTarget_add_libs,$(1),-liconv) $(call gb_LinkTarget_add_libs,$(1),-liconv)

1
config_host.mk.in
View File

@@ -525,6 +525,7 @@ export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
export SYSTEM_GENCMN=@SYSTEM_GENCMN@ export SYSTEM_GENCMN=@SYSTEM_GENCMN@
export SYSTEM_GLEW=@SYSTEM_GLEW@ export SYSTEM_GLEW=@SYSTEM_GLEW@
export SYSTEM_GLM=@SYSTEM_GLM@ export SYSTEM_GLM=@SYSTEM_GLM@
export SYSTEM_GLYPHY=@SYSTEM_GLYPHY@
export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@ export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@ export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@
export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@ export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@

1
external/Module_external.mk vendored
View File

@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GLEW,glew) \ $(call gb_Helper_optional,GLEW,glew) \
$(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,GLM,glm) \
$(call gb_Helper_optional,GLYPHY,glyphy) \
$(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \

2
external/glyphy/Module_glyphy.mk vendored
View File

@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,glyphy)) $(eval $(call gb_Module_Module,glyphy))
$(eval $(call gb_Module_add_targets,liborcus,\ $(eval $(call gb_Module_add_targets,glyphy,\
UnpackedTarball_glyphy \ UnpackedTarball_glyphy \
)) ))