ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 12:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix libscrypt includes

Browse Source
This commit is contained in:
mikolajp 2018-02-25 23:40:19 +08:00
parent f826497d47
commit c9aa26ad44
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jets/e/scr.c
View File

@ -6,8 +6,8 @@
#include <stdint.h>
#include <errno.h>
#include <libscrypt/libscrypt.h>
#include <libscrypt/sha256.h>
#include <libscrypt.h>
#include <sha256.h>
static int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
uint64_t, uint32_t, uint32_t, uint8_t *, size_t);

4
meson.build
View File

@ -267,12 +267,12 @@ sigsegv_dep = meson.get_compiler('c').find_library('sigsegv')
# For these libs we provide fallback bundle
cmark_dep = dependency('libcmark', version: '0.12.0', fallback: ['commonmark-legacy', 'cmark_dep'])
compiler_scrypt = meson.get_compiler('c').find_library('libscrypt')
compiler_scrypt = meson.get_compiler('c').find_library('libscrypt', required: false)
if compiler_scrypt.found()
urbitscrypt_dep = compiler_scrypt
else
urbitscrypt_dep = dependency('libscrypt', fallback: ['urbit-scrypt', 'urbit_scrypt_dep'])
urbitscrypt_dep = dependency('libscrypt', fallback: ['libscrypt', 'libscrypt_dep'])
endif
ed25519_dep = dependency('ed25519', fallback: ['ed25519', 'ed25519_dep'])