Module Name: src
Committed By: martin
Date: Fri Jan 8 13:00:50 UTC 2021
Modified Files:
src/compat [netbsd-9]: exec.mk
src/external/bsd/ipf [netbsd-9]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by simonb in ticket #1183):
external/bsd/ipf/Makefile.inc: revision 1.6
compat/exec.mk: revision 1.5
Use the compat machinery to build "native" IPF binaries as ipfilter
doesn't use compat32 64-bit alignment/size safe structures.
Fixes IPF on at least mips64.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/compat/exec.mk
cvs rdiff -u -r1.3 -r1.3.16.1 src/external/bsd/ipf/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/exec.mk
diff -u src/compat/exec.mk:1.4 src/compat/exec.mk:1.4.2.1
--- src/compat/exec.mk:1.4 Thu Sep 20 02:51:21 2018
+++ src/compat/exec.mk Fri Jan 8 13:00:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: exec.mk,v 1.4 2018/09/20 02:51:21 macallan Exp $
+# $NetBSD: exec.mk,v 1.4.2.1 2021/01/08 13:00:50 martin Exp $
# this makefile fragment can be included to modify the default
# ABI a program is compiled with. this is designed to be used
@@ -7,6 +7,7 @@
# currently this file is used by these Makefiles:
#
+# external/bsd/ipf/Makefile.inc
# sbin/savecore/Makefile
# usr.bin/fstat/Makefile
# usr.bin/netstat/Makefile
@@ -22,7 +23,9 @@
# can be considered "not a bug". all the *stat tools should
# be converted to use sysctl(3) on the running kernel, and
# anyone who needs kvm-access on crash dumps can build their
-# own 64 bit version as necessary.
+# own 64 bit version as necessary. ipfilter doesn't use
+# 64-bit alignment/size safe structures.
+#
# mips64 defaults to 32 bit userland, but with a 64 bit kernel
# most kvm-using tools are happier with 64 bit.
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.3 src/external/bsd/ipf/Makefile.inc:1.3.16.1
--- src/external/bsd/ipf/Makefile.inc:1.3 Wed Jan 11 12:19:43 2017
+++ src/external/bsd/ipf/Makefile.inc Fri Jan 8 13:00:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/01/11 12:19:43 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3.16.1 2021/01/08 13:00:49 martin Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
@@ -36,3 +36,5 @@ CLEANFILES+= y.tab.c y.tab.h
${UDIST}/lib \
${UDIST}/tools \
${UDIST}/man
+
+.include "../../compat/exec.mk"
