[src/netbsd-7]: src Pull up following revision(s) (requested by manu in ticke...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5a31259cdd89
branches:  netbsd-7
changeset: 800263:5a31259cdd89
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jul 23 06:08:16 2017 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1440):
        distrib/utils/libhack/Makefile: revision 1.25
        distrib/utils/libhack/Makefile.inc: revision 1.27
        lib/libc/gen/getcap.c: revision 1.57
Make shared -DSMALL libc buildable without breaking libhack
We used -DSMALL to exclude code from libc in order to build
libhack. Introduce -DLIBHACK to do this without so that
-DSMALL does not remove code necessary for building a shared libc

diffstat:

 distrib/utils/libhack/Makefile     |  3 ++-
 distrib/utils/libhack/Makefile.inc |  3 ++-
 lib/libc/gen/getcap.c              |  8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 583a1a45bf15 -r 5a31259cdd89 distrib/utils/libhack/Makefile
--- a/distrib/utils/libhack/Makefile    Sun Jul 23 06:06:52 2017 +0000
+++ b/distrib/utils/libhack/Makefile    Sun Jul 23 06:08:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/08/27 09:53:33 christos Exp $
+# $NetBSD: Makefile,v 1.24.4.1 2017/07/23 06:08:16 snj Exp $
 #
 # Stubs to kill off some things from libc:
 # This save space on a boot system.
@@ -10,6 +10,7 @@
 HACKOBJ?=${.OBJDIR}
 
 CPPFLAGS+=     -DSMALL
+CPPFLAGS+=     -DLIBHACK
 CPPFLAGS.runetable.c+= -I${HACKSRC}/../../../lib/libc/citrus \
                        -DALL_80_TO_FF_SW1
 CPPFLAGS.syslog.c+=    -I${HACKSRC}/../../../lib/libc/include
diff -r 583a1a45bf15 -r 5a31259cdd89 distrib/utils/libhack/Makefile.inc
--- a/distrib/utils/libhack/Makefile.inc        Sun Jul 23 06:06:52 2017 +0000
+++ b/distrib/utils/libhack/Makefile.inc        Sun Jul 23 06:08:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2013/08/27 09:53:33 christos Exp $
+# $NetBSD: Makefile.inc,v 1.25.4.1 2017/07/23 06:08:16 snj Exp $
 #
 # Include this fragment to build libhack.o
 # It is .o and not .a to make sure these are the
@@ -17,6 +17,7 @@
 #                      
 
 CPPFLAGS+=     -DSMALL
+CPPFLAGS+=     -DLIBHACK
 HACKOBJS+=     getcap.o getgrent.o getnet.o getnetgr.o getpwent.o \
                localeconv.o multibyte.o perror.o runetable.o setlocale.o \
                strerror.o strsignal.o syslog.o utmp.o yplib.o
diff -r 583a1a45bf15 -r 5a31259cdd89 lib/libc/gen/getcap.c
--- a/lib/libc/gen/getcap.c     Sun Jul 23 06:06:52 2017 +0000
+++ b/lib/libc/gen/getcap.c     Sun Jul 23 06:08:16 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getcap.c,v 1.53 2014/06/26 20:14:32 christos Exp $     */
+/*     $NetBSD: getcap.c,v 1.53.2.1 2017/07/23 06:08:17 snj Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -41,11 +41,11 @@
 #if 0
 static char sccsid[] = "@(#)getcap.c   8.3 (Berkeley) 3/25/94";
 #else
-__RCSID("$NetBSD: getcap.c,v 1.53 2014/06/26 20:14:32 christos Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.53.2.1 2017/07/23 06:08:17 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifndef SMALL
+#ifndef LIBHACK
 #include "namespace.h"
 #endif
 #include <sys/types.h>
@@ -65,7 +65,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__weak_alias) && !defined(SMALL)
+#if defined(__weak_alias) && !defined(LIBHACK)
 __weak_alias(cgetcap,_cgetcap)
 __weak_alias(cgetclose,_cgetclose)
 __weak_alias(cgetent,_cgetent)