Add the libatf library

This adds reachover Makefiles to build the libatf library and enables it in
the parent Makefile.

Things to review in this change:

* Add proper version numbers in the shlib_version files.

* Is libatf properly listed in lib/Makefile?  It theoretically needs
  libstdc++, but the resulting binary library is not linked against it.
This commit is contained in:
jmmv 2007-11-12 14:56:24 +00:00
parent 2965cbca98
commit 096ebe7672
7 changed files with 190 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1079 2007/11/10 07:43:07 yamt Exp $
# $NetBSD: mi,v 1.1080 2007/11/12 14:56:25 jmmv Exp $
./etc/mtree/set.comp comp-sys-root
./usr/bin/addr2line comp-debug-bin bfd
./usr/bin/ar comp-util-bin bfd
@ -103,6 +103,25 @@
./usr/include/arpa/telnet.h comp-c-include
./usr/include/arpa/tftp.h comp-c-include
./usr/include/assert.h comp-c-include
./usr/include/atf comp-atf-include
./usr/include/atf.hpp comp-atf-include
./usr/include/atf/application.hpp comp-atf-include
./usr/include/atf/atffile.hpp comp-atf-include
./usr/include/atf/config.hpp comp-atf-include
./usr/include/atf/env.hpp comp-atf-include
./usr/include/atf/exceptions.hpp comp-atf-include
./usr/include/atf/expand.hpp comp-atf-include
./usr/include/atf/formats.hpp comp-atf-include
./usr/include/atf/fs.hpp comp-atf-include
./usr/include/atf/io.hpp comp-atf-include
./usr/include/atf/macros.hpp comp-atf-include
./usr/include/atf/parser.hpp comp-atf-include
./usr/include/atf/sanity.hpp comp-atf-include
./usr/include/atf/tests.hpp comp-atf-include
./usr/include/atf/text.hpp comp-atf-include
./usr/include/atf/ui.hpp comp-atf-include
./usr/include/atf/user.hpp comp-atf-include
./usr/include/atf/utils.hpp comp-atf-include
./usr/include/bfd comp-obsolete obsolete
./usr/include/bfd/ansidecl.h comp-obsolete obsolete
./usr/include/bfd/bfd.h comp-obsolete obsolete
@ -2071,6 +2090,8 @@
./usr/lib/libarchive_p.a comp-c-proflib profile
./usr/lib/libasn1.a comp-krb5-lib kerberos
./usr/lib/libasn1_p.a comp-krb5-proflib kerberos,profile
./usr/lib/libatf.a comp-atf-lib
./usr/lib/libatf_p.a comp-atf-lib
./usr/lib/libbfd.a comp-obsolete obsolete
./usr/lib/libbind9.a comp-bind-lib
./usr/lib/libbind9_p.a comp-bind-proflib profile

View File

@ -1,7 +1,8 @@
# $NetBSD: shl.mi,v 1.59 2007/11/04 23:28:17 tls Exp $
# $NetBSD: shl.mi,v 1.60 2007/11/12 14:56:26 jmmv Exp $
./usr/lib/crtbeginT.o comp-c-lib
./usr/lib/libarchive_pic.a comp-c-piclib
./usr/lib/libasn1_pic.a comp-c-piclib kerberos
./usr/lib/libatf_pic.a comp-atf-piclib
./usr/lib/libbind9_pic.a comp-bind-piclib
./usr/lib/libbluetooth_pic.a comp-c-piclib
./usr/lib/libbsdmalloc_pic.a comp-c-piclib

View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist,v 1.342 2007/10/17 23:04:10 garbled Exp $
# $NetBSD: NetBSD.dist,v 1.343 2007/11/12 14:56:25 jmmv Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@ -224,6 +224,7 @@
./usr/include/adosfs
./usr/include/altq
./usr/include/arpa
./usr/include/atf
./usr/include/crypto
./usr/include/dev
./usr/include/dev/apm

View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.119 2007/11/05 04:58:52 tls Exp $
# $NetBSD: Makefile,v 1.120 2007/11/12 14:56:24 jmmv Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
SUBDIR= csu libc .WAIT libarch libbsdmalloc libbluetooth libbz2 \
SUBDIR= csu libc .WAIT libarch libatf libbsdmalloc libbluetooth libbz2 \
libcompat libcrypt \
libcurses libevent libform libintl libkvm libl libm \
libmenu libossaudio libpcap libpci libpmc libposix libprop libpthread \

65
lib/libatf/Makefile Normal file
View File

@ -0,0 +1,65 @@
# $NetBSD: Makefile,v 1.1 2007/11/12 14:56:25 jmmv Exp $
.include <bsd.own.mk>
LIB= atf
NOPIC= yes # Interface is still too unstable
SRCDIR= ${NETBSDSRCDIR}/dist/atf
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf
CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -I${SRCDIR}/libs
CPPFLAGS+= -I.
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\"
CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\"
CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
WARNS?= 2
SRCS= application.cpp \
atffile.cpp \
config.cpp \
env.cpp \
exceptions.cpp \
expand.cpp \
formats.cpp \
fs.cpp \
io.cpp \
parser.cpp \
sanity.cpp \
tests.cpp \
text.cpp \
ui.cpp \
user.cpp
INCS= application.hpp \
atffile.hpp \
config.hpp \
env.hpp \
exceptions.hpp \
expand.hpp \
formats.hpp \
fs.hpp \
io.hpp \
macros.hpp \
parser.hpp \
sanity.hpp \
tests.hpp \
text.hpp \
ui.hpp \
user.hpp \
utils.hpp
INCSDIR= /usr/include/atf
INCS+= atf.hpp
INCSDIR_atf.hpp=/usr/include
MAN= # empty
.include <bsd.lib.mk>

92
lib/libatf/config.h Normal file
View File

@ -0,0 +1,92 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if basename takes a constant pointer */
/* #undef HAVE_CONST_BASENAME */
/* Define to 1 if dirname takes a constant pointer */
/* #undef HAVE_CONST_DIRNAME */
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
/* Define to 1 if putenv is in std */
/* #undef HAVE_PUTENV_IN_STD */
/* Define to 1 if you have the `setenv' function. */
#define HAVE_SETENV 1
/* Define to 1 if setenv is in std */
/* #undef HAVE_SETENV_IN_STD */
/* Define to 1 if snprintf is in std */
/* #undef HAVE_SNPRINTF_IN_STD */
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the `unmount' function. */
/* #undef HAVE_UNMOUNT */
/* Define to 1 if you have the `unsetenv' function. */
#define HAVE_UNSETENV 1
/* Define to 1 if unsetenv is in std */
/* #undef HAVE_UNSETENV_IN_STD */
/* Define to 1 if vnsprintf is in std */
/* #undef HAVE_VSNPRINTF_IN_STD */
/* Name of package */
#define PACKAGE "atf"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "atf-devel@NetBSD.org"
/* Define to the copyright string applicable to this package. */
#define PACKAGE_COPYRIGHT "Copyright (c) 2007 The NetBSD Foundation, Inc."
/* Define to the full name of this package. */
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Automated Testing Framework 0.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.3"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "0.3"

View File

@ -1,4 +1,4 @@
.\" $NetBSD: hier.7,v 1.76 2007/10/17 23:39:11 garbled Exp $
.\" $NetBSD: hier.7,v 1.77 2007/11/12 14:56:27 jmmv Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@ -29,7 +29,7 @@
.\"
.\" @(#)hier.7 8.5 (Berkeley) 6/1/94
.\"
.Dd January 6, 2007
.Dd July 11, 2007
.Dt HIER 7
.Os
.Sh NAME
@ -412,6 +412,9 @@ standard C include files
.Bl -tag -width "protocols/" -compact
.It Sy arpa/
include files for Internet service protocols
.It Sy atf/
include files for the Automated Testing Framework; see
.Xr atf 1
.It Sy g++/
include files for the C++ compiler
.It Sy machine/