commit effd58c4883b909f1d4700953e8e16ca20dc4032
parent affd2df911a174556e13c1a88557ead34485a607
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 9 Dec 2025 23:16:52 +0000
nvi: patch configure for -Wimplicit-int
Diffstat:
9 files changed, 140 insertions(+), 7 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -93,6 +93,7 @@ a21336df3bc3b267fbda940d9f533f66b0eacb520b8421cca3ddc943f620a791 files/mcm-musl
e91027b085cc83c7724fd6b624641a74256288b16e9f48a37d3ceeab6e498f3f files/nawk-20250116-proctab.c
98a8ddd1004034aeff4cc6d18e5df23f55d2869d879735c3b571594a44ba1212 files/nlist.h
ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417 files/noobjtool.patch
+4b849c5f9bbbd9b6bc5e191c220f32cf32ce2ca1a082dc9fc4e6027ebd173748 files/nvi-configure-implicit-return.patch
1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d files/pthbs-banginstall
627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e files/s6_clone3_newpid.patch
2a782825cd870e1fdf77a579c80701c0530bc6d8fa94100cab24bf31f0f457d3 files/s6_clone_newpid.patch
diff --git a/files/nvi-configure-implicit-return.patch b/files/nvi-configure-implicit-return.patch
@@ -0,0 +1,129 @@
+diff -ru --no-dereference --show-c-function nvi-1.79.orig/build/configure nvi-1.79/build/configure
+--- nvi-1.79.orig/build/configure 1996-10-23 13:53:07.000000000 +0000
++++ nvi-1.79/build/configure 2025-12-09 23:11:04.128099821 +0000
+@@ -837,7 +837,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 839 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -886,7 +886,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 888 "configure"
+ #include "confdefs.h"
+-main() { exit(0); }
++int main() { exit(0); }
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -1980,7 +1980,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 1982 "configure"
+ #include "confdefs.h"
+-main () {
++int main () {
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+@@ -3050,7 +3050,7 @@ sparc_address_test (arg) int arg;
+ }
+ }
+ }
+-main() {
++int main() {
+ pid_t parent = getpid ();
+ pid_t child;
+
+@@ -3637,7 +3637,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3639 "configure"
+ #include "confdefs.h"
+-main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
++int main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -3838,7 +3838,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3840 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(unsigned char) != 1);}
++int main(){exit(sizeof(unsigned char) != 1);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -3888,7 +3888,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3890 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(unsigned short) != 2);}
++int main(){exit(sizeof(unsigned short) != 2);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -3900,7 +3900,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3902 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(unsigned int) != 2);}
++int main(){exit(sizeof(unsigned int) != 2);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -3953,7 +3953,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3955 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(short) != 2);}
++int main(){exit(sizeof(short) != 2);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -3965,7 +3965,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3967 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(int) != 2);}
++int main(){exit(sizeof(int) != 2);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -4018,7 +4018,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 4020 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(unsigned int) != 4);}
++int main(){exit(sizeof(unsigned int) != 4);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -4030,7 +4030,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 4032 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(unsigned long) != 4);}
++int main(){exit(sizeof(unsigned long) != 4);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -4083,7 +4083,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 4085 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(int) != 4);}
++int main(){exit(sizeof(int) != 4);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+@@ -4095,7 +4095,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 4097 "configure"
+ #include "confdefs.h"
+-main(){exit(sizeof(long) != 4);}
++int main(){exit(sizeof(long) != 4);}
+ EOF
+ eval $ac_link
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
diff --git a/templates/pkg/nvi b/templates/pkg/nvi
@@ -4,10 +4,11 @@
{% extends "autotools_static_mini" %}
{% block package_deps -%}
#+{{pkg_install_name("netbsd-curses")}}
+#@sha256:{{files["nvi-configure-implicit-return.patch"]}}:nvi-configure-implicit-return.patch
{% endblock package_deps %}
{%- block configure -%}
build_env_static
-CFLAGS="-Wno-implicit-int $CFLAGS"
+patch -p1 <../nvi-configure-implicit-return.patch
./configure \
--prefix="$prefix" \
--build="$(${CC:-gcc} -dumpmachine)" \
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -83,7 +83,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+nvi.921e196e43f55e0d60f26054be05332d2436d04ca4d69a9f62ad52ac33b7853a
+#+nvi.f08b3bf6cc13ebba5a05184265b8d801a9249e041d341bceb42612ba62585219
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -32,6 +32,7 @@
#+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580
#+m4.3c2c0285db6a9478ec3d15df2ed5a84329ebf2770be190cdd64b375b505b336a
#+netbsd-curses.62fbfa6e36ad4c26813723d03cbfe75c3e7d20f081b985904d933a07a84a541e
+#@sha256:4b849c5f9bbbd9b6bc5e191c220f32cf32ce2ca1a082dc9fc4e6027ebd173748:nvi-configure-implicit-return.patch
#@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
@@ -86,7 +87,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'nvi-1.79/build'
build_env_static
-CFLAGS="-Wno-implicit-int $CFLAGS"
+patch -p1 <../nvi-configure-implicit-return.patch
./configure \
--prefix="$prefix" \
--build="$(${CC:-gcc} -dumpmachine)" \
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -83,7 +83,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+nvi.921e196e43f55e0d60f26054be05332d2436d04ca4d69a9f62ad52ac33b7853a
+#+nvi.f08b3bf6cc13ebba5a05184265b8d801a9249e041d341bceb42612ba62585219
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -83,7 +83,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+nvi.e5daa4c1bfd3a6805df0eeb655447b09ec74bd6d082528c3d4a5791b5d0c3bd4
+#+nvi.59466a4dd76829f0088db755cae76819e6422ce974891db378d6f8833f078aee
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -32,6 +32,7 @@
#+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59
#+m4.9525a842f294db9ba4dff2f5c09131b12ebd35df0c9e06c5404c3b046ba13748
#+netbsd-curses.d3d7d0cf449972d5ce479a15d7298bad50ba445982cca9b12dc99d950330ce2c
+#@sha256:4b849c5f9bbbd9b6bc5e191c220f32cf32ce2ca1a082dc9fc4e6027ebd173748:nvi-configure-implicit-return.patch
#@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
@@ -86,7 +87,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'nvi-1.79/build'
build_env_static
-CFLAGS="-Wno-implicit-int $CFLAGS"
+patch -p1 <../nvi-configure-implicit-return.patch
./configure \
--prefix="$prefix" \
--build="$(${CC:-gcc} -dumpmachine)" \
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -83,7 +83,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+nvi.e5daa4c1bfd3a6805df0eeb655447b09ec74bd6d082528c3d4a5791b5d0c3bd4
+#+nvi.59466a4dd76829f0088db755cae76819e6422ce974891db378d6f8833f078aee
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
\ No newline at end of file
