aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2008-11-24 03:07:52 +0800
committernaddy <naddy@FreeBSD.org>2008-11-24 03:07:52 +0800
commit8553d218c1c160275043c56100c4ac2e162b2cf8 (patch)
treebcda50b718f5ba052996c6d72a7eb1458b1c6fb8
parent856c416a3cf694258faff94ce411a4b61cfdfbf8 (diff)
downloadfreebsd-ports-gnome-8553d218c1c160275043c56100c4ac2e162b2cf8.tar.gz
freebsd-ports-gnome-8553d218c1c160275043c56100c4ac2e162b2cf8.tar.zst
freebsd-ports-gnome-8553d218c1c160275043c56100c4ac2e162b2cf8.zip
LP64 fixes
Approved by: itetcu
-rw-r--r--devel/libexecinfo/Makefile2
-rw-r--r--devel/libexecinfo/files/patch-execinfo.c27
2 files changed, 20 insertions, 9 deletions
diff --git a/devel/libexecinfo/Makefile b/devel/libexecinfo/Makefile
index ffe50a3fb77d..e1af970605e9 100644
--- a/devel/libexecinfo/Makefile
+++ b/devel/libexecinfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libexecinfo
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= itetcu
diff --git a/devel/libexecinfo/files/patch-execinfo.c b/devel/libexecinfo/files/patch-execinfo.c
index 3bf04f2a113a..27ebca3f1d19 100644
--- a/devel/libexecinfo/files/patch-execinfo.c
+++ b/devel/libexecinfo/files/patch-execinfo.c
@@ -1,6 +1,16 @@
---- execinfo.c.orig Sun Jul 18 22:21:09 2004
-+++ execinfo.c Wed Feb 9 16:56:51 2005
-@@ -78,7 +78,6 @@
+--- execinfo.c.orig
++++ execinfo.c
+@@ -69,7 +69,8 @@
+ char **
+ backtrace_symbols(void *const *buffer, int size)
+ {
+- int i, clen, alen, offset;
++ size_t clen, alen;
++ int i, offset;
+ char **rval;
+ char *cp;
+ Dl_info info;
+@@ -78,7 +79,6 @@
rval = malloc(clen);
if (rval == NULL)
return NULL;
@@ -8,7 +18,7 @@
for (i = 0; i < size; i++) {
if (dladdr(buffer[i], &info) != 0) {
if (info.dli_sname == NULL)
-@@ -92,14 +91,14 @@
+@@ -92,14 +92,14 @@
2 + /* " <" */
strlen(info.dli_sname) + /* "function" */
1 + /* "+" */
@@ -25,7 +35,7 @@
buffer[i], info.dli_sname, offset, info.dli_fname);
} else {
alen = 2 + /* "0x" */
-@@ -108,11 +107,14 @@
+@@ -108,12 +108,15 @@
rval = realloc_safe(rval, clen + alen);
if (rval == NULL)
return NULL;
@@ -37,9 +47,10 @@
+ rval[i] = (char *) clen;
+ clen += alen;
}
-+
-+ for (i = 0; i < size; i++)
-+ rval[i] += (int) rval;
++ for (i = 0; i < size; i++)
++ rval[i] += (long) rval;
++
return rval;
}
+