cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move to github, opensource.conformal.com is going away. from dhill.

Browse Source 
update to 0.3, rolling in patch.
This commit is contained in:
sthen 2016-03-11 19:46:13 +00:00
parent 1231aed82d
commit caf9ac569f
5 changed files with 14 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/libexecinfo/Makefile
View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.19 2015/03/16 18:07:42 naddy Exp $
# $OpenBSD: Makefile,v 1.20 2016/03/11 19:46:13 sthen Exp $
COMMENT = clone of backtrace facility found in the GNU libc
V = 0.2
DISTNAME = backtrace-$V
V = 0.3
GH_TAGNAME= BACKTRACE_${V:S/./_/g}
GH_ACCOUNT= conformal
GH_PROJECT= backtrace
DISTNAME = ${GH_PROJECT}-${V}
PKGNAME = libexecinfo-$V
REVISION = 5
EPOCH = 0
CATEGORIES = devel
SHARED_LIBS = execinfo 2.0
HOMEPAGE = http://opensource.conformal.com/wiki/Backtrace
MASTER_SITES = http://opensource.conformal.com/snapshots/backtrace/
EXTRACT_SUFX = .tgz
HOMEPAGE = https://github.com/conformal/backtrace/wiki
# BSD
PERMIT_PACKAGE_CDROM = Yes

4
devel/libexecinfo/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (backtrace-0.2.tgz) = XehJU3s/CpcphPvU1jhKa/HPShJ20N/Xk7TWLGV9OTQ=
SIZE (backtrace-0.2.tgz) = 4449
SHA256 (backtrace-0.3.tar.gz) = +fvMJbgnYpsihxc4xea6ZK1vBOAjmCI+LYKb8s13hlU=
SIZE (backtrace-0.3.tar.gz) = 4395

12
devel/libexecinfo/patches/patch-examples_backtrace_test_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-examples_backtrace_test_c,v 1.1 2012/09/27 15:45:42 jasper Exp $
--- examples/backtrace_test.c.orig Wed Sep 26 12:59:42 2012
+++ examples/backtrace_test.c Wed Sep 26 12:59:47 2012
@@ -26,6 +26,8 @@
#include "backtrace.h"
+#define BT_MAX_DEPTH (128)
+
void
f2(void)
{

27
devel/libexecinfo/patches/patch-libbacktrace_backtrace_c
View File

@ -1,28 +1,11 @@
$OpenBSD: patch-libbacktrace_backtrace_c,v 1.3 2014/04/03 11:40:02 jasper Exp $
- BT_MAX_DEPTH and struct bt_frame should not be exposed in a public header
since they're internal to libbacktrace.
$OpenBSD: patch-libbacktrace_backtrace_c,v 1.4 2016/03/11 19:46:13 sthen Exp $
- __builtin_return_address() and __builtin_frame_address()
may not always have a !0 argument.
--- libbacktrace/backtrace.c.orig Fri Sep 10 14:19:27 2010
+++ libbacktrace/backtrace.c Wed Sep 26 12:54:22 2012
@@ -35,7 +35,13 @@ __attribute__((unused)) static const char *cvstag = "$
#define BT_GET_DEPTH (1)
#define BT_ADD_CR (1)
+#define BT_MAX_DEPTH (128)
+struct bt_frame {
+ Dl_info bt_dlinfo;
+ unsigned int line;
+};
+
#define HANDLE_FRAME(depth, idx, btaddr) \
case depth: \
if (!__builtin_frame_address(depth + 1)) \
@@ -59,6 +65,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
--- libbacktrace/backtrace.c.orig Thu Mar 3 10:15:09 2016
+++ libbacktrace/backtrace.c Thu Mar 3 10:15:38 2016
@@ -65,6 +65,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
/* number of HANDLE_FRAME must match BT_MAX_DEPTH */
switch (i) {
HANDLE_FRAME(0, i, addr);
@ -30,7 +13,7 @@ $OpenBSD: patch-libbacktrace_backtrace_c,v 1.3 2014/04/03 11:40:02 jasper Exp $
HANDLE_FRAME(1, i, addr);
HANDLE_FRAME(2, i, addr);
HANDLE_FRAME(3, i, addr);
@@ -186,6 +193,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
@@ -192,6 +193,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
HANDLE_FRAME(125, i, addr);
HANDLE_FRAME(126, i, addr);
HANDLE_FRAME(127, i, addr);

40
devel/libexecinfo/patches/patch-libbacktrace_backtrace_h
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-libbacktrace_backtrace_h,v 1.2 2012/09/27 15:45:42 jasper Exp $
- BT_MAX_DEPTH and struct bt_frame should not be exposed in a public header
since they're internal to libbacktrace.
--- libbacktrace/backtrace.h.orig Fri Sep 10 00:23:45 2010
+++ libbacktrace/backtrace.h Wed Sep 26 12:54:25 2012
@@ -16,18 +16,26 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef _EXECINFO_H_
+#define _EXECINFO_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef __GNUC__
#error "this library must be compiled with gcc"
#endif
-#define BT_MAX_DEPTH (128)
+#include <dlfcn.h>
-struct bt_frame {
- Dl_info bt_dlinfo;
- unsigned int line;
-};
-
/* compatability functions with libexecinfo and glibc */
int backtrace(void **, int);
char **backtrace_symbols(void *const *, int);
void backtrace_symbols_fd(void *const *, int, int);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+