Rename test.patch

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
 
 cd busybox-w32
 cp /root/busybox-w32-packaging/config .config
-git apply /root/busybox-w32-packaging/test.patch
+git apply /root/busybox-w32-packaging/libressl.patch
+# For some reason this code only causes errors on -O0
+if [ -n "$ZERO_PATCH" ]; then
+        git apply /root/busybox-w32-packaging/zero.patch
+fi
 sed -i "s/CONFIG_EXTRA_CFLAGS=\"\"/CONFIG_EXTRA_CFLAGS=\"$CFLAGS\"/g" .config
 make
 cp 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 = {
 local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]}
 local builds = {}
 for opti_k, opti_v, rel_k, rel_v, _, comp_v in cartesian(optimizations, debug, compilers) do
-        builds["busybox-w32-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = {
+        local build = {
                 timeout=600,
                 image="image-" .. comp_v,
                 requires = {
@@ -31,5 +31,9 @@ for opti_k, opti_v, rel_k, rel_v, _, comp_v in cartesian(optimizations, debug, c
                         CFLAGS = opti_v .. " " .. rel_v,
                 }
         }
+        if opti_k == "zero" then
+                build.env.ZERO_PATCH="true"
+        end
+        builds["busybox-w32-" .. opti_k .. "-" .. rel_k .. "-" .. comp_v] = build
 end
 return 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 @@
+diff --git a/win32/inet_pton.c b/win32/inet_pton.c
+index f229a9355..9f4466b8e 100644
+--- a/win32/inet_pton.c
++++ b/win32/inet_pton.c
+@@ -36,6 +36,7 @@ static int hexval(unsigned c)
+        return -1;
+ }
+ 
++/*
+ int inet_pton(int af, const char *restrict s, void *restrict a0)
+ {
+        uint16_t ip[8];
+@@ -93,3 +94,4 @@ int inet_pton(int af, const char *restrict s, void *restrict a0)
+        if (need_v4 && inet_pton(AF_INET, (void *)s, a-4) <= 0) return 0;
+        return 1;
+ }
++*/