Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Permit Arweave to Run on FreeBSD #622

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/arweave/c_src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ ifeq ($(UNAME_SYS), Darwin)
LDFLAGS += -undefined suppress
else ifeq ($(UNAME_SYS), FreeBSD)
CC ?= cc
CFLAGS += -std=c99 -finline-functions -Wall -Wmissing-prototypes
CXXFLAGS += -finline-functions -Wall
CFLAGS += -std=c99 -finline-functions -Wall -Wmissing-prototypes -I/usr/local/include
CXXFLAGS += -finline-functions -Wall -I/usr/local/include
else ifeq ($(UNAME_SYS), Linux)
CC ?= gcc
CFLAGS += -std=c99 -finline-functions -Wall -Wmissing-prototypes
Expand Down
6 changes: 4 additions & 2 deletions apps/arweave/src/ar_disksup.erl
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,11 @@ check_disk_space({unix, darwin}, Port) ->
check_disks_susv3(skip_to_eol(Result)).

disk_free_cmd({unix, darwin}, Df, DataDirPath, Port) ->
my_cmd(Df ++ " -Pa " ++ DataDirPath ++ "/", Port);
my_cmd(Df ++ " -Pa " ++ DataDirPath ++ "/", Port);
disk_free_cmd({unix, freebsd}, Df, DataDirPath, Port) ->
my_cmd(Df ++ " -P " ++ DataDirPath ++ "/", Port);
disk_free_cmd({unix, _}, Df, DataDirPath, Port) ->
my_cmd(Df ++ " -Pa -B1 " ++ DataDirPath ++ "/", Port).
my_cmd(Df ++ " -Pa -B1 " ++ DataDirPath ++ "/", Port).

%% check for hardware errors in df output
check_for_hardware_error(DfOutput, ThrowOnError) ->
Expand Down
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{deps, [
{b64fast, {git, "https://github.com/ArweaveTeam/b64fast.git", {ref, "58f0502e49bf73b29d95c6d02460d1fb8d2a5273"}}},
{jiffy, {git, "https://github.com/ArweaveTeam/jiffy.git", {ref, "74c956defa9116c85d76f77c3e9b5bd6de7bd39a"}}},
{jiffy, {git, "https://github.com/davisp/jiffy.git"}},
{gun, "1.3.3"},
{cowboy, "2.10.0"},
{graphql, {git, "https://github.com/shopgun/graphql-erlang.git", {branch, "master"}}},
Expand Down
4 changes: 2 additions & 2 deletions rebar.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
0},
{<<"gun">>,{pkg,<<"gun">>,<<"1.3.3">>},0},
{<<"jiffy">>,
{git,"https://github.com/ArweaveTeam/jiffy.git",
{ref,"74c956defa9116c85d76f77c3e9b5bd6de7bd39a"}},
{git,"https://github.com/davisp/jiffy.git",
{ref,"50daa80a62a97ffb6dd46ea9cb8ccb4930cbf1ae"}},
0},
{<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},0},
{<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},0},
Expand Down