Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Toolchain upgrade and portability improvements.

Browse Source 
upgrade to NetBSD CVS release from 2012/10/17 12:00:00 UTC

Makefiles updates to imporve portability

Made sure to be consistent in the usage of braces/parenthesis at
least on a per file basis. For variables, it is recommended to
continue to use braces.
This commit is contained in:
Lionel Sambuc
2012-10-26 15:22:39 +02:00
parent 9152e1c5a7
commit d19d7d58aa
369 changed files with 56599 additions and 27810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libc/cdb/Makefile.inc
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.1 2010/04/25 00:54:46 joerg Exp $
# $NetBSD: Makefile.inc,v 1.2 2012/03/17 17:59:58 christos Exp $
# Constant database reader/writer
@@ -19,3 +19,6 @@ MLINKS+= cdbw.3 cdbw_put_data.3
MLINKS+= cdbw.3 cdbw_put_key.3
MLINKS+= cdbw.3 cdbw_output.3
MLINKS+= cdbw.3 cdbw_close.3
# XXX: Fix the code instead
LINTFLAGS.cdbw.c += -X 132,259,298

2
lib/libc/compat/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2010/06/07 13:52:29 tnozaki Exp $
# $NetBSD: Makefile,v 1.6 2012/01/22 18:36:16 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#

2
lib/libc/compat/Makefile.inc
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.6 2010/06/07 13:52:29 tnozaki Exp $
# $NetBSD: Makefile.inc,v 1.7 2012/01/22 18:36:16 christos Exp $
CPPFLAGS+= -I${NETBSDSRCDIR}/sys

2
lib/libc/db/Makefile.inc
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.6 1997/10/22 23:14:11 lukem Exp $
# $NetBSD: Makefile.inc,v 1.8 2011/08/09 13:03:36 joerg Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 2/21/94
#
CPPFLAGS+=-D__DBINTERFACE_PRIVATE

2
lib/libc/iconv/Makefile.inc
View File

@@ -6,4 +6,4 @@ SRCS+= iconv.c
MAN+= iconv.3
MLINKS+=iconv.3 iconv_open.3 iconv.3 iconv_close.3
CPPFLAGS.iconv.c+= -DHAVE_CITRUS -I${LIBCDIR}/citrus
CPPFLAGS.iconv.c+= -I${LIBCDIR}/citrus

41
lib/libc/iconv/iconv.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $ */
/* $NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $");
__RCSID("$NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -45,7 +45,6 @@ __weak_alias(iconv_open, _iconv_open)
__weak_alias(iconv_close, _iconv_close)
#endif
#ifdef HAVE_CITRUS
#include <sys/types.h>
#include "citrus_types.h"
#include "citrus_module.h"
@@ -150,39 +149,3 @@ __iconv_free_list(char **list, size_t sz)
{
_citrus_esdb_free_list(list, sz);
}
#else
iconv_t
/*ARGSUSED*/
iconv_open(const char *in, const char *out)
{
errno = EINVAL;
return ((iconv_t)-1);
}
int
/*ARGSUSED*/
iconv_close(iconv_t handle)
{
errno = EBADF;
return (-1);
}
size_t
/*ARGSUSED*/
iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
{
errno = EBADF;
return ((size_t)-1);
}
int
/*ARGSUSED*/
__iconv_get_list(char ***rlist, size_t *rsz)
{
errno = EINVAL;
return -1;
}
void
/*ARGSUSED*/
__iconv_free_list(char **list, size_t sz)
{
}
#endif

7
lib/libc/net/Makefile.inc
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.78 2009/10/02 02:45:29 tsarna Exp $
# $NetBSD: Makefile.inc,v 1.81 2012/01/20 14:08:05 joerg Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -58,6 +58,11 @@ nslexer.c: nslexer.l nsparser.h
.include "${ARCHDIR}/net/Makefile.inc"
.if ${HAVE_GCC:U} == "45" && ${MACHINE_CPU} == "arm"
COPTS.getaddrinfo.c+= ${${ACTIVE_CC} == "gcc" :? -fno-tree-ter :}
COPTS.gethnamaddr.c+= ${${ACTIVE_CC} == "gcc" :? -fno-tree-ter :}
.endif
MAN+= byteorder.3 ethers.3 gethostbyname.3 getifaddrs.3 \
getnetent.3 getprotoent.3 getpeereid.3 \
getservent.3 inet.3 inet_net.3 iso_addr.3 linkaddr.3 \

9
lib/libminlib/Makefile
View File

@@ -1,5 +1,8 @@
.include <bsd.own.mk>
.PATH: ${.CURDIR} ${.CURDIR}/${MACHINE_ARCH}
.include "${MACHINE_ARCH}/Makefile.inc"
INCSDIR= /usr/include
LIB= minlib
@@ -31,13 +34,9 @@ SRCS+= paramvalue.c
SRCS+= getngid.c getnpid.c getnprocnr.c getnucred.c getnuid.c getprocnr.c \
mapdriver.c vm_memctl.c vm_set_priv.c vm_query_exit.c vm_update.c
SRCS+= oneC_sum.c
.include "${MACHINE_ARCH}/Makefile.inc"
.include <bsd.own.mk>
SUBDIR+= pkgconfig
.include <bsd.subdir.mk>
.include <bsd.lib.mk>
.include <bsd.subdir.mk>

4
lib/libminlib/pkgconfig/Makefile
View File

@@ -1,7 +1,7 @@
NOOBJ= # defined
.include <bsd.own.mk>
NOOBJ= # defined
FILES=minlib.pc
FILESDIR=/usr/lib
FILESMODE=444