Skip to content

Commit 18476d8

Browse files
kpy3Sergei Elin
andauthored
Update (#8)
* Proper 1.4.0 * Detect architecture * Update supported Erlang versions --------- Co-authored-by: Sergei Elin <s.elin@xpay.by>
1 parent a687092 commit 18476d8

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
otp_version: [21, 22, 23, 24]
18+
otp_version: [25, 26, 27]
1919
os: [ubuntu-latest]
2020

2121
container:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Erlang NIF for scrypt
22
=====================
33

4-
[![Build Status](https://github.com/kpy3/erlscrypt/workflows/Test/badge.svg)](https://github.com/kpy3/erlscrypt/actions?query=branch%3Amaster+workflow%3A"Test") [![Erlang Versions](https://img.shields.io/badge/Supported%20Erlang%2FOTP-21.0%20to%2024.0-blue)](http://www.erlang.org)
4+
[![Build Status](https://github.com/kpy3/erlscrypt/workflows/Test/badge.svg)](https://github.com/kpy3/erlscrypt/actions?query=branch%3Amaster+workflow%3A"Test") [![Erlang Versions](https://img.shields.io/badge/Supported%20Erlang%2FOTP-25.0%20to%2027.0-blue)](http://www.erlang.org)
55

66

77
An Erlang NIF for Colin Percival's "scrypt" function. It uses dirty CPU schedulers for

c_src/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so
1515
# System type and C compiler/flags.
1616

1717
UNAME_SYS := $(shell uname -s)
18+
UNAME_ARCH := $(shell uname -m)
1819
ifeq ($(UNAME_SYS), Darwin)
1920
CC ?= cc
20-
CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes -fomit-frame-pointer -funroll-loops
21-
CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall -fomit-frame-pointer -funroll-loops
22-
LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
21+
CFLAGS ?= -O3 -std=c99 -arch $(UNAME_ARCH) -finline-functions -Wall -Wmissing-prototypes -fomit-frame-pointer -funroll-loops
22+
CXXFLAGS ?= -O3 -arch $(UNAME_ARCH) -finline-functions -Wall -fomit-frame-pointer -funroll-loops
23+
LDFLAGS ?= -arch $(UNAME_ARCH) -flat_namespace -undefined suppress
2324
else ifeq ($(UNAME_SYS), FreeBSD)
2425
CC ?= cc
2526
CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes -fomit-frame-pointer -funroll-loops

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{plugins, [erlfmt, rebar3_proper]},
66
{deps, [
77
%% hex
8-
{proper, "1.3.0"}
8+
{proper, "1.4.0"}
99
]}
1010
]}
1111
]}.

src/scrypt.app.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{application, scrypt, [
22
{description, "Erlang NIF for scrypt"},
3-
{vsn, "2.1.0"},
3+
{vsn, "2.1.1"},
44
{registered, []},
55
{mod, {scrypt, []}},
66
{applications, [

0 commit comments

Comments
 (0)