vendor libsodium

anoma · Mar 20, 2024 · a648819 · a648819
1 parent 1bf55bc
commit a648819
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -5,6 +5,15 @@ RUN_EQC=erl -pa _build/default/lib/enacl/ebin -noshell -s enacl_eqc -s init stop
 compile:
 	$(REBAR) compile
 
+.PHONY: libsodium
+libsodium: libsodium/install/lib/libsodium.a
+
+libsodium/install/lib/libsodium.a: libsodium/Makefile
+	(cd libsodium;  $(MAKE) -j install)
+
+libsodium/Makefile:
+	(cd libsodium; ./configure --prefix=`pwd`/install --disable-pie)
+
 .PHONY: tests
 tests:
 	$(REBAR) ct

diff --git a/rebar.config b/rebar.config
@@ -17,22 +17,23 @@
     ]}
 ]}.
 
+{pre_hooks,
+  [{"(linux|darwin|solaris|freebsd)", compile, "make libsodium"}]
+  % windows ???
+}.
+
 {port_env, [
-    {"darwin", "CFLAGS", "$CFLAGS -fPIC -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes"},
-    {"darwin", "CXXFLAGS", "$CXXFLAGS -fPIC -O3 -finline-functions -Wall"},
-    {"darwin", "LDFLAGS", "$LDFLAGS -flat_namespace -undefined suppress -lsodium"},
+    {"darwin", "CFLAGS", "$CFLAGS -fPIC -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes -Ilibsodium/install/include"},
+    {"darwin", "LDFLAGS", "$LDFLAGS -flat_namespace -undefined suppress libsodium/install/lib/libsodium.a"},
 
-    {"linux", "CFLAGS", "$CFLAGS -fPIC -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes"},
-    {"linux", "CXXFLAGS", "$CXXFLAGS -fPIC -O3 -finline-functions -Wall"},
-    {"linux", "LDFLAGS", "$LDFLAGS -lsodium"},
+    {"linux", "CFLAGS", "$CFLAGS -fPIC -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes -Ilibsodium/install/include"},
+    {"linux", "LDFLAGS", "$LDFLAGS libsodium/install/lib/libsodium.a"},
 
-    {"freebsd", "CFLAGS", "$CFLAGS -fPIC -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes -I /usr/local/include"},
-    {"freebsd", "CXXFLAGS", "$CXXFLAGS -fPIC -O3 -finline-functions -Wall"},
-    {"freebsd", "LDFLAGS", "$LDFLAGS -fPIC -L /usr/local/lib -lsodium"},
+    {"freebsd", "CFLAGS", "$CFLAGS -fPIC -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes -I /usr/local/include -Ilibsodium/install/include"},
+    {"freebsd", "LDFLAGS", "$LDFLAGS -fPIC -L /usr/local/lib libsodium/install/lib/libsodium.a"},
 
-    {"solaris", "CFLAGS", "$CFLAGS -fPIC -m64 -I/opt/local/include -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes"},
-    {"solaris", "CXXFLAGS", "$CXXFLAGS -fPIC -O2 -finline-function -Wall"},
-    {"solaris", "LDFLAGS", "$LDFLAGS -m64 -fPIC -L /opt/local/lib -lsodium"},
+    {"solaris", "CFLAGS", "$CFLAGS -fPIC -m64 -I/opt/local/include -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes -Ilibsodium/install/include"},
+    {"solaris", "LDFLAGS", "$LDFLAGS -m64 -fPIC -L /opt/local/lib libsodium/install/lib/libsodium.a"},
 
     {"win32", "CFLAGS", "$CFLAGS /LD /O2 /DNDEBUG"},
     {"win32", "LDFLAGS", "$LDFLAGS libsodium.dll.a"}