libgetopt-1.4.6: Don't replace getopt on SunOS.

This commit is contained in:
jperkin 2014-09-11 21:48:34 +00:00
parent 35315cecee
commit c2be8e75b1
3 changed files with 8 additions and 8 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.35 2014/01/01 02:48:31 ryoon Exp $
# $NetBSD: Makefile,v 1.36 2014/09/11 21:48:34 jperkin Exp $
#
DISTNAME= libgetopt-1.4.5
DISTNAME= libgetopt-1.4.6
CATEGORIES= pkgtools sysutils
MASTER_SITES= # empty
DISTFILES= # empty
@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/libgetopt
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || \
.if ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || \
${OPSYS} == "OSF1" || ${OPSYS} == "Linux"
CFLAGS+= -DREPLACE_GETOPT
.endif

View file

@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.14 2014/01/01 02:48:31 ryoon Exp $
# $NetBSD: buildlink3.mk,v 1.15 2014/09/11 21:48:34 jperkin Exp $
BUILDLINK_TREE+= getopt
.if !defined(LIBGETOPT_BUILDLINK3_MK)
LIBGETOPT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.4.5
BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.4.6
BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
.endif # LIBGETOPT_BUILDLINK3_MK

View file

@ -1,4 +1,4 @@
/* $NetBSD: getopt.h,v 1.8 2014/01/01 02:48:31 ryoon Exp $ */
/* $NetBSD: getopt.h,v 1.9 2014/09/11 21:48:34 jperkin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@ int getopt_long(int, char * const *, const char *,
/* On some platforms, this is in libc, but not in a system header */
extern int optreset;
#if defined(__sgi) || defined(__GLIBC__)
#if defined(__sgi) || defined(__sun) || defined(__GLIBC__)
extern char *optarg;
extern int opterr;
extern int optind;