[src/trunk]: src Use the compat machinery to build "native" IPF binaries as i...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c696e9e216d9
branches:  trunk
changeset: 979673:c696e9e216d9
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Jan 05 11:07:59 2021 +0000

description:
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.

diffstat:

 compat/exec.mk                |  7 +++++--
 external/bsd/ipf/Makefile.inc |  4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 3b188948d2cc -r c696e9e216d9 compat/exec.mk
--- a/compat/exec.mk    Tue Jan 05 07:37:41 2021 +0000
+++ b/compat/exec.mk    Tue Jan 05 11:07:59 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: exec.mk,v 1.4 2018/09/20 02:51:21 macallan Exp $
+#      $NetBSD: exec.mk,v 1.5 2021/01/05 11:08:00 simonb 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.
diff -r 3b188948d2cc -r c696e9e216d9 external/bsd/ipf/Makefile.inc
--- a/external/bsd/ipf/Makefile.inc     Tue Jan 05 07:37:41 2021 +0000
+++ b/external/bsd/ipf/Makefile.inc     Tue Jan 05 11:07:59 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2020/09/06 07:20:26 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2021/01/05 11:07:59 simonb Exp $
 
 WARNS?=        1       # XXX -Wcast-qual -Wshadow
 CWARNFLAGS.clang+=     -Wno-format -Wno-tautological-compare \
@@ -39,3 +39,5 @@
        ${UDIST}/lib    \
        ${UDIST}/tools  \
        ${UDIST}/man
+
+.include "../../compat/exec.mk"