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

add missing openssl & nss3 dependencies to libxmlsec

Browse Source 
These are required at configure time.
This commit is contained in:
Michael Meeks
2013-02-28 12:05:07 +00:00
parent bfdcde7c2e
commit b440cfcc54
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RepositoryExternal.mk
View File

@@ -2283,6 +2283,8 @@ endef
endif # GUIBASE=unx endif # GUIBASE=unx
gb_ExternalProject__use_nss3:=
ifeq (,$(filter DESKTOP,$(BUILD_TYPE))) ifeq (,$(filter DESKTOP,$(BUILD_TYPE)))
gb_LinkTarget__use_nss3:= gb_LinkTarget__use_nss3:=
@@ -2359,6 +2361,16 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef endef
define gb_ExternalProject__use_nss3
$(call gb_ExternalProject_use_package,$(1),nss)
$(call gb_ExternalProject_use_libraries,$(1),\
nspr4 \
nss3 \
smime3 \
)
endef
endif endif
endif # DESKTOP endif # DESKTOP

4
libxmlsec/ExternalProject_xmlsec.mk
View File

@@ -13,6 +13,10 @@ $(eval $(call gb_ExternalProject_use_unpacked,xmlsec,xmlsec))
$(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2)) $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
$(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
$(eval $(call gb_ExternalProject_register_targets,xmlsec,\ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
build \ build \
)) ))