Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
martin 2021-01-08 13:02:56 +00:00
parent 69487e463a
commit 58f9dbce31
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compat/exec.mk
View File

@ -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.

4
external/bsd/ipf/Makefile.inc vendored
View File

@ -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"