summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-11-07 20:03:29 -0600
committerAlexander M Pickering <alex@cogarr.net>2024-11-07 20:03:29 -0600
commitc2b012a90590ab3fa531392fd27003e62c156099 (patch)
tree1723c385f1dfea06d98984b3f49acc594fa79d34
parent5b097074086426430f6b3fda1fcd8b6e4ab16a82 (diff)
downloadbusybox-w32-packaging-c2b012a90590ab3fa531392fd27003e62c156099.tar.gz
busybox-w32-packaging-c2b012a90590ab3fa531392fd27003e62c156099.tar.bz2
busybox-w32-packaging-c2b012a90590ab3fa531392fd27003e62c156099.zip
Rename test.patch
-rwxr-xr-xinit6
-rw-r--r--libressl.patch (renamed from test.patch)0
-rw-r--r--meta.lua6
-rw-r--r--zero.patch17
4 files changed, 27 insertions, 2 deletions
diff --git a/init b/init
index 5f856a5..348c86b 100755
--- a/init
+++ b/init
@@ -13,7 +13,11 @@ mv libcrypto.a /usr/x86_64-w64-mingw32/lib
13 13
14cd busybox-w32 14cd busybox-w32
15cp /root/busybox-w32-packaging/config .config 15cp /root/busybox-w32-packaging/config .config
16git apply /root/busybox-w32-packaging/test.patch 16git apply /root/busybox-w32-packaging/libressl.patch
17# For some reason this code only causes errors on -O0
18if [ -n "$ZERO_PATCH" ]; then
19 git apply /root/busybox-w32-packaging/zero.patch
20fi
17sed -i "s/CONFIG_EXTRA_CFLAGS=\"\"/CONFIG_EXTRA_CFLAGS=\"$CFLAGS\"/g" .config 21sed -i "s/CONFIG_EXTRA_CFLAGS=\"\"/CONFIG_EXTRA_CFLAGS=\"$CFLAGS\"/g" .config
18make 22make
19cp busybox.exe .. 23cp busybox.exe ..
diff --git a/test.patch b/libressl.patch
index f49ed9d..f49ed9d 100644
--- a/test.patch
+++ b/libressl.patch
diff --git a/meta.lua b/meta.lua
index 8e5296a..6e217a1 100644
--- a/meta.lua
+++ b/meta.lua
@@ -14,7 +14,7 @@ local debug = {
14local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]} 14local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]}
15local builds = {} 15local builds = {}
16for opti_k, opti_v, rel_k, rel_v, _, comp_v in cartesian(optimizations, debug, compilers) do 16for opti_k, opti_v, rel_k, rel_v, _, comp_v in cartesian(optimizations, debug, compilers) do
17 builds["busybox-w32-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = { 17 local build = {
18 timeout=600, 18 timeout=600,
19 image="image-" .. comp_v, 19 image="image-" .. comp_v,
20 requires = { 20 requires = {
@@ -31,5 +31,9 @@ for opti_k, opti_v, rel_k, rel_v, _, comp_v in cartesian(optimizations, debug, c
31 CFLAGS = opti_v .. " " .. rel_v, 31 CFLAGS = opti_v .. " " .. rel_v,
32 } 32 }
33 } 33 }
34 if opti_k == "zero" then
35 build.env.ZERO_PATCH="true"
36 end
37 builds["busybox-w32-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = build
34end 38end
35return builds 39return builds
diff --git a/zero.patch b/zero.patch
new file mode 100644
index 0000000..1ec175d
--- /dev/null
+++ b/zero.patch
@@ -0,0 +1,17 @@
1diff --git a/win32/inet_pton.c b/win32/inet_pton.c
2index f229a9355..9f4466b8e 100644
3--- a/win32/inet_pton.c
4+++ b/win32/inet_pton.c
5@@ -36,6 +36,7 @@ static int hexval(unsigned c)
6 return -1;
7 }
8
9+/*
10 int inet_pton(int af, const char *restrict s, void *restrict a0)
11 {
12 uint16_t ip[8];
13@@ -93,3 +94,4 @@ int inet_pton(int af, const char *restrict s, void *restrict a0)
14 if (need_v4 && inet_pton(AF_INET, (void *)s, a-4) <= 0) return 0;
15 return 1;
16 }
17+*/