diff options
| author |   brad <brad@openbsd.org> | 2014-04-13 08:35:27 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2014-04-13 08:35:27 +0000 |
| commit | 1d9ab11e5addad3fcb154dc561a61ba2c6500c9b (patch) | |
| tree | 06a7e3e88c7b65af22a41e2ff4448852f307912d | |
| parent | perform the same ACPITZ_INIT operation as attach does, at DVACT_WAKEUP (diff) | |
| download | wireguard-openbsd-1d9ab11e5addad3fcb154dc561a61ba2c6500c9b.tar.xz wireguard-openbsd-1d9ab11e5addad3fcb154dc561a61ba2c6500c9b.zip | |
Clean up last bits of TCP_WRAPPERS and ELF_TOOLCHAIN.
ok miod@
| -rw-r--r-- | gnu/usr.sbin/sendmail/Makefile.inc | 10 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/sendmail/Makefile | 3 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 9 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/Makefile.inc | 4 |
4 files changed, 4 insertions, 22 deletions
diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc index ef655baab87..714436cc6fd 100644 --- a/gnu/usr.sbin/sendmail/Makefile.inc +++ b/gnu/usr.sbin/sendmail/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.19 2013/01/09 22:17:58 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.20 2014/04/13 08:35:27 brad Exp $ .include <bsd.own.mk> .include <bsd.obj.mk> @@ -42,14 +42,6 @@ LDFLAGS+=-L${.CURDIR}/../libsm .endif .endif -.if defined(WANT_LIBWRAP) -.if (${TCP_WRAPPERS:L} == "yes") -ENVDEF+=-DTCPWRAPPERS -DPADD+= ${LIBWRAP} -LDADD+= -lwrap -.endif -.endif - # To build with LDAP map support define WANT_LDAP in /etc/mk.conf (unsupported) .if defined(WANT_LDAP) .if !defined(LIB) || (${LIB} != "milter") diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile index 73a8783580c..2a4f9809838 100644 --- a/gnu/usr.sbin/sendmail/sendmail/Makefile +++ b/gnu/usr.sbin/sendmail/sendmail/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.30 2014/03/19 21:10:27 tedu Exp $ +# $OpenBSD: Makefile,v 1.31 2014/04/13 08:35:27 brad Exp $ PROG= sendmail .include <bsd.own.mk> -WANT_LIBWRAP=1 WANT_LIBSM=1 WANT_LIBSMUTIL=1 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index e53644f2650..ad0c3ad2927 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.147 2014/03/23 17:29:06 pascal Exp $ +# $OpenBSD: bsd.own.mk,v 1.148 2014/04/13 08:35:27 brad Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -16,13 +16,8 @@ SKEY?= yes KERBEROS5?= yes # Set `YP' to `yes' to build with support for NIS/YP. YP?= yes -# Set `TCP_WRAPPERS' to `yes' to build certain networking daemons with -# integrated support for libwrap. -TCP_WRAPPERS?= no # Set `DEBUGLIBS' to `yes' to build libraries with debugging symbols DEBUGLIBS?= no -# Set toolchain to be able to know differences. -ELF_TOOLCHAIN?= yes GCC3_ARCH=m88k vax BINUTILS217_ARCH=hppa64 ia64 @@ -147,8 +142,6 @@ PICFLAG?=-fpic .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" ASPICFLAG=-KPIC -.elif ${ELF_TOOLCHAIN:L} == "no" -ASPICFLAG=-k .endif .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \ diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc index 21e4b6b104f..4ffc3d5b489 100644 --- a/sys/arch/alpha/stand/Makefile.inc +++ b/sys/arch/alpha/stand/Makefile.inc @@ -1,8 +1,6 @@ -# $OpenBSD: Makefile.inc,v 1.14 2012/12/17 19:03:22 martynas Exp $ +# $OpenBSD: Makefile.inc,v 1.15 2014/04/13 08:35:27 brad Exp $ # $NetBSD: Makefile.inc,v 1.8 1997/04/06 08:39:38 cgd Exp $ -.include <bsd.own.mk> # for ELF_TOOLCHAIN definition - BINDIR= /usr/mdec # For descriptions of regions available to bootstrap programs, see |