diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 20:53:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 23:56:19 +0200 |
| commit | 6de75d132fe44a6f3e6160fec0c2e5e32ed023d3 (patch) | |
| tree | fb7239e88f8a9cd67f5710f39b44c39af57f91ed /onlineupdate/StaticLibrary_libmar.mk | |
| parent | 2539702ff5e7bf6bc5dbdb3f8301196487b9266b (diff) | |
updater: get the signature verification working on Windows
The updater itself does not link to NSS on Windows and instead uses the
Windows-internal crypto libraries. However the mar executable needs to
link against NSS, so we need to split the code a bit.
Change-Id: Iea61c716aa507a876fdb444eb28ad828bdea18bd
Reviewed-on: https://gerrit.libreoffice.org/40608
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'onlineupdate/StaticLibrary_libmar.mk')
| -rw-r--r-- | onlineupdate/StaticLibrary_libmar.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk index ee62c5d20a2a..1e0fc605566d 100644 --- a/onlineupdate/StaticLibrary_libmar.mk +++ b/onlineupdate/StaticLibrary_libmar.mk @@ -15,19 +15,17 @@ $(eval $(call gb_StaticLibrary_set_include,libmar,\ )) $(eval $(call gb_StaticLibrary_add_defs,libmar,\ - -DMAR_NSS \ -)) - -$(eval $(call gb_StaticLibrary_use_externals,libmar,\ - nss3 \ + -DUNICODE \ )) $(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 \ +)) + +$(eval $(call gb_StaticLibrary_use_static_libraries,\ + libmarverify \ )) # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ |