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

- bring back fixes to fix this on mips64*

Browse Source 
ok sthen@
This commit is contained in:
jasper 2011-11-16 15:12:53 +00:00
parent bef8781387
commit 6984f2b752
5 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/libexecinfo/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2011/11/14 19:14:18 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2011/11/16 15:12:53 jasper Exp $
COMMENT = clone of backtrace facility found in the GNU libc
V = 0.2
DISTNAME = backtrace-$V
PKGNAME = libexecinfo-$V
REVISION = 0
EPOCH = 0
CATEGORIES = devel
@ -28,6 +29,14 @@ MAKE_FLAGS = LIB=execinfo
FAKE_FLAGS = PREFIX=${WRKINST}/${TRUEPREFIX} \
MANDIR=${PREFIX}/man/man
.if ${MACHINE_ARCH:Mmips64*}
EXTRA_CFLAGS= -D__BUILTIN_HACK
# See bsd.lib.mk:162
PKG_ARGS+= -Dno_mips64=0
.else
PKG_ARGS+= -Dno_mips64=1
.endif
do-configure:
printf "major=${LIBexecinfo_VERSION:R}\nminor=${LIBexecinfo_VERSION:E}\n" \
> ${WRKSRC}/libbacktrace/shlib_version

15
devel/libexecinfo/patches/patch-libbacktrace_Makefile
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-libbacktrace_Makefile,v 1.1 2011/11/14 19:14:18 sthen Exp $
--- libbacktrace/Makefile.orig Sat Nov 12 21:05:03 2011
+++ libbacktrace/Makefile Sat Nov 12 21:05:07 2011
$OpenBSD: patch-libbacktrace_Makefile,v 1.2 2011/11/16 15:12:53 jasper Exp $
--- libbacktrace/Makefile.orig Mon May 2 19:23:58 2011
+++ libbacktrace/Makefile Wed Nov 16 16:00:26 2011
@@ -13,7 +13,7 @@ CFLAGS+= -fdiagnostics-show-option -Wall -Werror
CFLAGS+= -Wall -Werror
.endif
CFLAGS+= -ggdb3
-CFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include ${EXTRA_CFLAGS}
LDFLAGS+= -Wl,--export-dynamic
HDRS= backtrace.h
@@ -26,9 +26,9 @@ CLEANFILES+= backtrace.cat3
includes:

23
devel/libexecinfo/patches/patch-libbacktrace_backtrace_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-libbacktrace_backtrace_c,v 1.1 2011/11/16 15:12:53 jasper Exp $
__builtin_return_address() and __builtin_frame_address()
can't have a !0 argument on mips.
--- libbacktrace/backtrace.c.orig Wed Nov 16 16:00:58 2011
+++ libbacktrace/backtrace.c Wed Nov 16 16:01:38 2011
@@ -59,6 +59,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);
+#ifndef __BUILTIN_HACK
HANDLE_FRAME(1, i, addr);
HANDLE_FRAME(2, i, addr);
HANDLE_FRAME(3, i, addr);
@@ -186,6 +187,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);
+#endif
default:
goto done;
}

2
devel/libexecinfo/pkg/PFRAG.no_mips64 Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.no_mips64,v 1.3 2011/11/16 15:12:53 jasper Exp $
lib/libexecinfo_pic.a

4
devel/libexecinfo/pkg/PLIST
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.4 2011/11/14 19:14:18 sthen Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/11/16 15:12:53 jasper Exp $
%%SHARED%%
%%no_mips64%%
@bin bin/backtrace_test
include/execinfo.h
lib/libexecinfo.a
lib/libexecinfo_p.a
lib/libexecinfo_pic.a
@man man/man3/backtrace.3
@man man/man3/backtrace_symbols.3
@man man/man3/backtrace_symbols_fd.3