diff options
| author |   millert <millert@openbsd.org> | 2000-11-19 21:27:13 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2000-11-19 21:27:13 +0000 |
| commit | f47b617caaba8c7232e749c22b29952e8e72d415 (patch) | |
| tree | 785ec5d96c2018e7c3f964a874efed62d0bf1b13 | |
| parent | Correctly deal with NOMAN being set. Since it may be set in mk.conf (diff) | |
| download | wireguard-openbsd-f47b617caaba8c7232e749c22b29952e8e72d415.tar.xz wireguard-openbsd-f47b617caaba8c7232e749c22b29952e8e72d415.zip | |
XXX - Alpha port doesn't currently support weak symbols
| -rw-r--r-- | lib/Makefile | 9 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/openbsd/keynote_compat.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index 0812a0c439b..46ee28f49a7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,11 +1,16 @@ -# $OpenBSD: Makefile,v 1.37 2000/01/30 01:22:59 mickey Exp $ +# $OpenBSD: Makefile,v 1.38 2000/11/19 21:27:13 millert Exp $ # $NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $ -SUBDIR= csu libarch libc libc_r libcom_err libcompat libcurses libdes libedit \ +SUBDIR= csu libarch libc libcom_err libcompat libcurses libdes libedit \ libform libkeynote libl libm libmenu libocurses libossaudio libpanel \ libpcap libresolv librpcsvc libskey libssl libtelnet libutil libwrap \ liby libz +# XXX Temporary until libc_r builds on alpha again +.if ${MACHINE} != "alpha" +SUBDIR+= libc_r +.endif + # XXX Temporary until libcurses++ builds on mips again .if ${MACHINE_ARCH} != "mips" SUBDIR+= libcurses++ diff --git a/sbin/isakmpd/sysdep/openbsd/keynote_compat.c b/sbin/isakmpd/sysdep/openbsd/keynote_compat.c index b884c274bec..9c67a028599 100644 --- a/sbin/isakmpd/sysdep/openbsd/keynote_compat.c +++ b/sbin/isakmpd/sysdep/openbsd/keynote_compat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keynote_compat.c,v 1.1 2000/10/16 23:26:54 niklas Exp $ */ +/* $OpenBSD: keynote_compat.c,v 1.2 2000/11/19 21:27:13 millert Exp $ */ /* $EOM: keynote_compat.c,v 1.1 2000/10/15 19:18:26 niklas Exp $ */ /* @@ -35,10 +35,13 @@ * updating some kind of version preprocessor symbol we can test. * Provide weak functions that can be used if the libkeynote version * we link against miss them. + * XXX - Alpha does not currently support weak functions. */ +#ifndef __alpha__ #pragma weak kn_get_string=_kn_get_string #pragma weak kn_free_key=_kn_free_key +#endif /* * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) |