summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-11-05 17:19:46 -0600
committerAlexander M Pickering <alex@cogarr.net>2024-11-05 17:19:46 -0600
commitc29b1ec0d5697f3e3b1be1c023fce103f6d9950e (patch)
tree9089fa8609a2d9cedf6b1a85f591ba0d5107de3c
parentba643c482e4ace5a913f623dfc84ecbe7a2b7719 (diff)
downloadportable-packaging-c29b1ec0d5697f3e3b1be1c023fce103f6d9950e.tar.gz
portable-packaging-c29b1ec0d5697f3e3b1be1c023fce103f6d9950e.tar.bz2
portable-packaging-c29b1ec0d5697f3e3b1be1c023fce103f6d9950e.zip
More work on version pin
-rwxr-xr-xinit4
-rw-r--r--meta.lua6
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 @@
4rc-service networking start 4rc-service networking start
5 5
6cd portable 6cd portable
7
7./autogen.sh 8./autogen.sh
9
8CC=gcc ./configure --host=x86_64-w64-mingw32 10CC=gcc ./configure --host=x86_64-w64-mingw32
9make 11make
10tar -caf include.tar.xz include/tls.h 12tar -caf include.tar.xz include/tls.h include/openssl
11cp tls/.libs/libtls.a /root 13cp tls/.libs/libtls.a /root
12cp ssl/.libs/libbs.a /root 14cp ssl/.libs/libbs.a /root
13cp ssl/.libs/libssl.a /root 15cp 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"] = {
20 produces = {}, 20 produces = {},
21 export=true, 21 export=true,
22} 22}
23local libressl="v4.0.0" -- pin a verson since master is unstable
23for opti_k, opti_v, rel_k, rel_v, comp_k, comp_v in cartesian(optimizations, debug, compilers) do 24for opti_k, opti_v, rel_k, rel_v, comp_k, comp_v in cartesian(optimizations, debug, compilers) do
24 builds["libressl-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = { 25 builds["libressl-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = {
25 image="libressl-meta", 26 image="libressl-meta",
26 requires = { 27 requires = {
27 {"git", "portable#v4.0.0"}, 28 {"git", "portable#" .. libressl},
28 }, 29 },
29 produces = { 30 produces = {
30 ["libssl.a"] = true, 31 ["libssl.a"] = true,
@@ -38,7 +39,8 @@ for opti_k, opti_v, rel_k, rel_v, comp_k, comp_v in cartesian(optimizations, deb
38 }, 39 },
39 timeout = 600, --Jeez this takes forever 40 timeout = 600, --Jeez this takes forever
40 env = { 41 env = {
41 CFLAGS=" " .. opti_v .. " " .. rel_v 42 CFLAGS=" " .. opti_v .. " " .. rel_v,
43 LIBRESSL_VERSION=libressl
42 }, 44 },
43 } 45 }
44end 46end