More work on version pin

2 files changed, 7 insertions, 3 deletions

diff --git a/init b/init
index f799343..b2fb108 100755
--- a/init
+++ b/init
@@ -4,10 +4,12 @@
 rc-service networking start
 
 cd portable
+
 ./autogen.sh
+
 CC=gcc ./configure --host=x86_64-w64-mingw32
 make
-tar -caf include.tar.xz include/tls.h
+tar -caf include.tar.xz include/tls.h include/openssl
 cp tls/.libs/libtls.a /root
 cp ssl/.libs/libbs.a /root
 cp ssl/.libs/libssl.a /root
diff --git a/meta.lua b/meta.lua
index 4616fa8..7fb2c18 100644
--- a/meta.lua
+++ b/meta.lua
@@ -20,11 +20,12 @@ builds["libressl-meta"] = {
         produces = {},
         export=true,
 }
+local libressl="v4.0.0" -- pin a verson since master is unstable
 for opti_k, opti_v, rel_k, rel_v, comp_k, comp_v in cartesian(optimizations, debug, compilers) do
         builds["libressl-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = {
                 image="libressl-meta",
                 requires = {
-                        {"git", "portable#v4.0.0"},
+                        {"git", "portable#" .. libressl},
                 },
                 produces = {
                         ["libssl.a"] = true,
@@ -38,7 +39,8 @@ for opti_k, opti_v, rel_k, rel_v, comp_k, comp_v in cartesian(optimizations, deb
                 },
                 timeout = 600, --Jeez this takes forever
                 env = {
-                        CFLAGS=" " .. opti_v .. " " .. rel_v
+                        CFLAGS=" " .. opti_v .. " " .. rel_v,
+                        LIBRESSL_VERSION=libressl
                 },
         }
 end