From 66e500ce5d858f840f525d1a2dab9a04535aa247 Mon Sep 17 00:00:00 2001 From: mortimer Date: Wed, 9 Jun 2021 19:44:55 +0000 Subject: [PATCH] Enable libexecinfo. With some build plumbing help from jsg@ ok kettenis@ sthen@ --- distrib/sets/lists/base/mi | 1 + distrib/sets/lists/comp/mi | 4 ++++ gnu/lib/Makefile | 4 ++-- include/Makefile | 4 ++-- share/man/man3/intro.3 | 7 +++++-- share/mk/bsd.prog.mk | 3 ++- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 3bbd5007456..e3840e88855 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -648,6 +648,7 @@ ./usr/lib/libedit.so.5.2 ./usr/lib/libelf.so.3.0 ./usr/lib/libevent.so.4.1 +./usr/lib/libexecinfo.so.3.0 ./usr/lib/libexpat.so.14.0 ./usr/lib/libfido2.so.4.0 ./usr/lib/libform.so.6.0 diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 7da1c934f7b..976cd739bab 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -875,6 +875,7 @@ ./usr/include/eti.h ./usr/include/event.h ./usr/include/evutil.h +./usr/include/execinfo.h ./usr/include/expat.h ./usr/include/expat_external.h ./usr/include/fcntl.h @@ -1501,6 +1502,8 @@ ./usr/lib/libelf_p.a ./usr/lib/libevent.a ./usr/lib/libevent_p.a +./usr/lib/libexecinfo.a +./usr/lib/libexecinfo_p.a ./usr/lib/libexpat.a ./usr/lib/libexpat_p.a ./usr/lib/libfido2.a @@ -2201,6 +2204,7 @@ ./usr/share/man/man3/auth_subr.3 ./usr/share/man/man3/authenticate.3 ./usr/share/man/man3/authnone_create.3 +./usr/share/man/man3/backtrace.3 ./usr/share/man/man3/basename.3 ./usr/share/man/man3/bcmp.3 ./usr/share/man/man3/bcopy.3 diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index f784a6d945e..88d24ecd94c 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2021/01/02 20:04:36 patrick Exp $ +# $OpenBSD: Makefile,v 1.25 2021/06/09 19:44:55 mortimer Exp $ .include -SUBDIR+=libcompiler_rt libiberty libreadline +SUBDIR+=libcompiler_rt libexecinfo libiberty libreadline SUBDIR+=libcxxabi libcxx .if make(obj) SUBDIR+=libstdc++ libstdc++-v3 libsupc++-v3 diff --git a/include/Makefile b/include/Makefile index 99aca922d7f..1fd278b408a 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.228 2021/01/02 20:04:36 patrick Exp $ +# $OpenBSD: Makefile,v 1.229 2021/06/09 19:44:55 mortimer Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -49,7 +49,7 @@ RDIRS= ../lib/libagentx ../lib/libcbor ../lib/libcurses ../lib/libedit \ ../lib/libradius \ ../lib/libskey ../lib/libssl ../lib/libtls \ ../lib/libusbhid ../lib/libutil ../lib/libz \ - ../usr.bin/lex ../gnu/lib/libreadline \ + ../usr.bin/lex ../gnu/lib/libexecinfo ../gnu/lib/libreadline \ ../sys/arch/${MACHINE} .if ${BUILD_GCC3:L} == "yes" diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index 3d4f4d43d0b..72350936ce8 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.3,v 1.94 2020/10/26 17:10:38 jmc Exp $ +.\" $OpenBSD: intro.3,v 1.95 2021/06/09 19:44:55 mortimer Exp $ .\" $NetBSD: intro.3,v 1.5 1995/05/10 22:46:24 jtc Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: October 26 2020 $ +.Dd $Mdocdate: June 9 2021 $ .Dt INTRO 3 .Os .Sh NAME @@ -158,6 +158,9 @@ file descriptor occurs or after a given time has passed. See .Xr event 3 . .Pp +.It libexecinfo Pq Fl lexecinfo +Library providing backtrace functions. +.Pp .It libexpat Pq Fl lexpat Library routines for parsing XML documents. .Pp diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 5f7c9841619..dc2252e78fa 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.82 2020/09/22 10:31:46 martijn Exp $ +# $OpenBSD: bsd.prog.mk,v 1.83 2021/06/09 19:44:55 mortimer Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -35,6 +35,7 @@ LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a LIBELF?= ${DESTDIR}/usr/lib/libelf.a LIBEVENT?= ${DESTDIR}/usr/lib/libevent.a +LIBEXECINFO?= ${DESTDIR}/usr/lib/libexecinfo.a LIBEXPAT?= ${DESTDIR}/usr/lib/libexpat.a LIBFIDO2?= ${DESTDIR}/usr/lib/libfido2.a LIBFORM?= ${DESTDIR}/usr/lib/libform.a -- 2.20.1