diff options
| -rw-r--r-- | onlineupdate/Executable_mar.mk | 2 | ||||
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 8 | ||||
| -rw-r--r-- | onlineupdate/StaticLibrary_libmar.mk | 10 |
3 files changed, 17 insertions, 3 deletions
diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk index 488ca26f4728..628ca2680058 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -39,8 +39,6 @@ endif $(eval $(call gb_Executable_add_cobjects,mar,\ onlineupdate/source/libmar/sign/nss_secutil \ onlineupdate/source/libmar/sign/mar_sign \ - onlineupdate/source/libmar/verify/cryptox \ - onlineupdate/source/libmar/verify/mar_verify \ onlineupdate/source/libmar/tool/mar \ )) diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index c3eeed5dd0fb..a2342581c3ea 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -42,8 +42,14 @@ $(eval $(call gb_Executable_add_libs,updater,\ endif $(eval $(call gb_Executable_use_externals,updater,\ - gtk \ bzip2 \ + $(if $(filter LINUX,$(OS)), \ + gtk \ + nss3 )\ +)) + +$(eval $(call gb_Executable_add_defs,updater,\ + -DVERIFY_MAR_SIGNATURE \ )) $(eval $(call gb_Executable_add_exception_objects,updater,\ diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk index 3c85b739bc3c..ee62c5d20a2a 100644 --- a/onlineupdate/StaticLibrary_libmar.mk +++ b/onlineupdate/StaticLibrary_libmar.mk @@ -14,10 +14,20 @@ $(eval $(call gb_StaticLibrary_set_include,libmar,\ $$(INCLUDE) \ )) +$(eval $(call gb_StaticLibrary_add_defs,libmar,\ + -DMAR_NSS \ +)) + +$(eval $(call gb_StaticLibrary_use_externals,libmar,\ + nss3 \ +)) + $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\ onlineupdate/source/libmar/src/mar_create \ onlineupdate/source/libmar/src/mar_extract \ onlineupdate/source/libmar/src/mar_read \ + onlineupdate/source/libmar/verify/mar_verify \ + onlineupdate/source/libmar/verify/cryptox \ )) # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ |