From 58f9dbce314dbdbb76ddfe43d9f0e96aa18fc5af Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 8 Jan 2021 13:02:56 +0000 Subject: [PATCH] Pull up following revision(s) (requested by simonb in ticket #1646): 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. --- compat/exec.mk | 7 +++++-- external/bsd/ipf/Makefile.inc | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/compat/exec.mk b/compat/exec.mk index bf4b098bb7c4..2e4f3eac336b 100644 --- a/compat/exec.mk +++ b/compat/exec.mk @@ -1,4 +1,4 @@ -# $NetBSD: exec.mk,v 1.3 2017/01/05 21:28:42 skrll Exp $ +# $NetBSD: exec.mk,v 1.3.8.1 2021/01/08 13:02:56 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. diff --git a/external/bsd/ipf/Makefile.inc b/external/bsd/ipf/Makefile.inc index 061153102b7a..6e8aa74165ec 100644 --- a/external/bsd/ipf/Makefile.inc +++ b/external/bsd/ipf/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2017/01/11 12:19:43 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.3.6.1 2021/01/08 13:02:56 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"