re: CVS commit: [pgoyette-compat] src/sys/arch/amd64/conf

2018-03-05 Thread matthew green
"Paul Goyette" writes:
> Module Name:  src
> Committed By: pgoyette
> Date: Tue Mar  6 04:45:04 UTC 2018
> 
> Modified Files:
>   src/sys/arch/amd64/conf [pgoyette-compat]: GENERIC
> Added Files:
>   src/sys/arch/amd64/conf [pgoyette-compat]: NOCOMPAT
> 
> Log Message:
> Add a NOCOMPAT kernel definition to serve as a baseline for getting
> the incremental COMPAT_xx options working.
> 
> While here, add some additional "requires COMPAT_xxx" to some of the
> options in GENERIC

thanks for fixing this stuff up.  i think there can be more
clean up here.  eg:

! options   COMPAT_LINUX32  # requires COMPAT_LINUX and COMPAT_NETBSD32
!   # and COMPAT_50 (or older)

this sort of thing shoudd be handled by having depends in
the files* files.  eg,

conf/files:defflagopt_compat_netbsd.h COMPAT_70: COMPAT_NETBSD

should be all it needs, not any comments or extra options.

thanks.


.mrg.


CVS commit: src/share/mk

2018-03-05 Thread Robert Swindells

Christos Zoulas  wrote:
>Module Name:src
>Committed By:   christos
>Date:   Sat Mar  3 00:22:04 UTC 2018
>
>Modified Files:
>src/share/mk: bsd.own.mk
>
>Log Message:
>switch arm to openssl-1.1

I don't think this is working, it needs to use MACHINE_CPU as the
test:

diff -u -r1.1045 bsd.own.mk
--- bsd.own.mk  5 Mar 2018 09:17:42 -   1.1045
+++ bsd.own.mk  5 Mar 2018 19:18:58 -
@@ -101,7 +101,7 @@
 # What OpenSSL is used?
 # 
 .if ${MACHINE} == "amd64" || \
-${MACHINE} == "arm" || \
+${MACHINE_CPU} == "arm" || \
 ${MACHINE} == "i386" || \
 ${MACHINE_CPU} == "powerpc" || \
 ${MACHINE_CPU} == "sh3" || \


re: CVS commit: src/share/mk

2018-03-05 Thread matthew green
Rin Okuyama writes:
> On 2018/03/05 16:46, matthew green wrote:
> > yes - it was alpha i switched, and while it worked a week
> > or two ago, it seems broken now.  argh.
> 
> Ah, I understand. Sorry for the noise.

no noise.  you let me know i had confused myself :-)

thanks.  arm and ia64 are now switched, leaving just
vax, m68k and sh3.