Module Name: src
Committed By: martin
Date: Tue Jul 4 12:57:45 UTC 2017
Modified Files:
src/distrib/utils/libhack [netbsd-8]: Makefile Makefile.inc
src/lib/libc/gen [netbsd-8]: getcap.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #79):
distrib/utils/libhack/Makefile.inc: revision 1.27
lib/libc/gen/getcap.c: revision 1.57
distrib/utils/libhack/Makefile: revision 1.25
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
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.18.1 src/distrib/utils/libhack/Makefile
cvs rdiff -u -r1.26 -r1.26.8.1 src/distrib/utils/libhack/Makefile.inc
cvs rdiff -u -r1.56 -r1.56.8.1 src/lib/libc/gen/getcap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/Makefile
diff -u src/distrib/utils/libhack/Makefile:1.24 src/distrib/utils/libhack/Makefile:1.24.18.1
--- src/distrib/utils/libhack/Makefile:1.24 Tue Aug 27 09:53:33 2013
+++ src/distrib/utils/libhack/Makefile Tue Jul 4 12:57:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/08/27 09:53:33 christos Exp $
+# $NetBSD: Makefile,v 1.24.18.1 2017/07/04 12:57:45 martin Exp $
#
# Stubs to kill off some things from libc:
# This save space on a boot system.
@@ -10,6 +10,7 @@ HACKSRC?=${.CURDIR}
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
Index: src/distrib/utils/libhack/Makefile.inc
diff -u src/distrib/utils/libhack/Makefile.inc:1.26 src/distrib/utils/libhack/Makefile.inc:1.26.8.1
--- src/distrib/utils/libhack/Makefile.inc:1.26 Mon Aug 25 14:11:51 2014
+++ src/distrib/utils/libhack/Makefile.inc Tue Jul 4 12:57:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/08/25 14:11:51 christos Exp $
+# $NetBSD: Makefile.inc,v 1.26.8.1 2017/07/04 12:57:45 martin 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
Index: src/lib/libc/gen/getcap.c
diff -u src/lib/libc/gen/getcap.c:1.56 src/lib/libc/gen/getcap.c:1.56.8.1
--- src/lib/libc/gen/getcap.c:1.56 Wed Sep 24 13:18:52 2014
+++ src/lib/libc/gen/getcap.c Tue Jul 4 12:57:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.56 2014/09/24 13:18:52 christos Exp $ */
+/* $NetBSD: getcap.c,v 1.56.8.1 2017/07/04 12:57:45 martin 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.56 2014/09/24 13:18:52 christos Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.56.8.1 2017/07/04 12:57:45 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef SMALL
+#ifndef LIBHACK
#include "namespace.h"
#endif
#include <sys/types.h>
@@ -65,7 +65,7 @@ __RCSID("$NetBSD: getcap.c,v 1.56 2014/0
#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)
