kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnbcompat-20140725:

Browse source 
Newer Linux systems have moved libutil.h to bsd/libutil.h, add the
  necessary checks for that location.  Fixes at least Ubuntu 12.04.
This commit is contained in:
jperkin 2014-07-25 13:26:24 +00:00
parent a4190d5f18
commit b63f9ab414
6 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/libnbcompat/Makefile
View file

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.80 2014/03/03 03:30:53 obache Exp $
# $NetBSD: Makefile,v 1.81 2014/07/25 13:26:24 jperkin Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
# list of tested and supported platforms.
#
PKGNAME= libnbcompat-20130908
PKGNAME= libnbcompat-20140725
CATEGORIES= pkgtools devel
MAINTAINER= joerg@NetBSD.org

7
pkgtools/libnbcompat/files/README
View file

@ -1,4 +1,4 @@
$NetBSD: README,v 1.19 2013/09/08 16:24:43 ryoon Exp $
$NetBSD: README,v 1.20 2014/07/25 13:26:24 jperkin Exp $
0 Introduction
==============
@ -91,6 +91,11 @@ on the following operating systems:
DragonFly/amd64 3.4.1 <ryoon@NetBSD.org>
Debian GNU/Linux/amd64 7.1 <ryoon@NetBSD.org>
libnbcompat-20140725 has been tested to build and install correctly
on the following operating systems:
Ubuntu GNU/Linux/amd64 12.04 <jperkin@joyent.com>
3 Usage
=======

6
pkgtools/libnbcompat/files/configure vendored
View file

@ -4383,9 +4383,9 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
fi
for ac_header in alloca.h assert.h ctype.h dirent.h endian.h err.h errno.h \
fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h limits.h \
machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
for ac_header in alloca.h assert.h bsd/libutil.h ctype.h dirent.h endian.h \
err.h errno.h fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h \
limits.h machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
stdarg.h stddef.h stdint.h stdio.h \
stdlib.h string.h sys/byteorder.h sys/cdefs.h sys/dir.h sys/endian.h \
sys/file.h sys/mkdev.h sys/ndir.h sys/param.h sys/socket.h sys/stat.h \

8
pkgtools/libnbcompat/files/configure.ac
View file

@ -1,4 +1,4 @@
dnl $NetBSD: configure.ac,v 1.82 2014/03/14 22:08:17 ryoon Exp $
dnl $NetBSD: configure.ac,v 1.83 2014/07/25 13:26:24 jperkin Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
@ -33,9 +33,9 @@ AC_HEADER_STDC
AC_HEADER_TIME
AC_HEADER_STDBOOL
AC_CHECK_HEADERS([alloca.h assert.h ctype.h dirent.h endian.h err.h errno.h \
fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h limits.h \
machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
AC_CHECK_HEADERS([alloca.h assert.h bsd/libutil.h ctype.h dirent.h endian.h \
err.h errno.h fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h \
limits.h machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
stdarg.h stddef.h stdint.h stdio.h \
stdlib.h string.h sys/byteorder.h sys/cdefs.h sys/dir.h sys/endian.h \
sys/file.h sys/mkdev.h sys/ndir.h sys/param.h sys/socket.h sys/stat.h \

3
pkgtools/libnbcompat/files/nbcompat/config.h.in
View file

@ -174,6 +174,9 @@
/* Define to 1 if you have the `util' library (-lutil). */
#undef HAVE_LIBUTIL
/* Define to 1 if you have the <bsd/libutil.h> header file. */
#undef HAVE_BSD_LIBUTIL_H
/* Define to 1 if you have the <libutil.h> header file. */
#undef HAVE_LIBUTIL_H

6
pkgtools/libnbcompat/files/nbcompat/util.h
View file

@ -1,4 +1,4 @@
/* $NetBSD: util.h,v 1.2 2008/04/29 05:46:08 martin Exp $ */
/* $NetBSD: util.h,v 1.3 2014/07/25 13:26:24 jperkin Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -35,7 +35,9 @@
#if HAVE_UTIL_H
# include <util.h>
#endif
#if HAVE_LIBUTIL_H
#if HAVE_BSD_LIBUTIL_H
# include <bsd/libutil.h>
#elif HAVE_LIBUTIL_H
# include <libutil.h>
#endif