Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Jul 2004 10:51:42 +0200 (CEST)
From:      Simon Barner <barner@in.tum.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/69553: [maintainer] ports/valgrind: update to version 352
Message-ID:  <20040725085142.B02193FBC@zi025.glhnet.mhn.de>
Resent-Message-ID: <200407250900.i6P90er5025640@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         69553
>Category:       ports
>Synopsis:       [maintainer] ports/valgrind: update to version 352
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 25 09:00:39 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Sat Apr 17 12:06:11 CEST 2004 toor@zi025.glhnet.mhn.de:/usr/src/sys/i386/compile/KISTE i386

>Description:

Update port to latest version from Doug Rabsons SVN repository. The main
part of the port update is also by him.

Other improvement: Check gmake version, since the build process fails
with gmake < 3.80.

Note: there is a similar PR for valgrind-snapshot :-)

>How-To-Repeat:

N/A

>Fix:

diff -ruN valgrind.orig/Makefile valgrind/Makefile
--- valgrind.orig/Makefile	Sun May 23 19:00:03 2004
+++ valgrind/Makefile	Sun Jul 25 10:41:43 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	valgrind
-PORTVERSION=	327
+PORTVERSION=	352
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rabson.org/
 DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
@@ -27,6 +27,7 @@
 .include <bsd.port.pre.mk>
 
 PROCFS!=	/sbin/mount | ${GREP} '^procfs' | ${AWK} '{print $1}'
+GMAKE_VER!=	gmake -v | ${AWK} ' NR == 1 { print $$3 } '
 
 pre-everything::
 
@@ -44,6 +45,14 @@
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "-----------------------------------------------------------"
 	@${FALSE}
+.endif
+
+.if ${GMAKE_VER} < 3.80
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "All gmake versions < 3.80 are affected by a bug that makes the"
+	@${ECHO_CMD} "valgrind port fail. Please update your gmake installation."
+	@${ECHO_CMD} ""
+	@${FALSE}       
 .endif
 
 .if ${PERL_LEVEL} < 500601
diff -ruN valgrind.orig/distinfo valgrind/distinfo
--- valgrind.orig/distinfo	Sun May 23 19:00:03 2004
+++ valgrind/distinfo	Sun Jul 25 10:06:12 2004
@@ -1,2 +1,2 @@
-MD5 (valgrind-stable-327.tar.gz) = 56aabe03a41c4ebbb0cf2fbda3f4656a
-SIZE (valgrind-stable-327.tar.gz) = 1161744
+MD5 (valgrind-stable-352.tar.gz) = dcf8f9d7d9f8092d2215362c169fd0ab
+SIZE (valgrind-stable-352.tar.gz) = 1228052
diff -ruN valgrind.orig/files/patch-rev328 valgrind/files/patch-rev328
--- valgrind.orig/files/patch-rev328	Sun May 23 19:00:03 2004
+++ valgrind/files/patch-rev328	Thu Jan  1 01:00:00 1970
@@ -1,16 +0,0 @@
---- coregrind/vg_main.c	2004-04-10 08:32:49 UTC (rev 327)
-+++ coregrind/vg_main.c	2004-04-19 09:10:49 UTC (rev 328)
-@@ -1135,9 +1135,10 @@
- 
-    /* Move logfile_fd into the safe range, so it doesn't conflict with any app fds */
-    eventually_logfile_fd = VG_(fcntl)(VG_(clo_logfile_fd), VKI_F_DUPFD, VG_(max_fd)+1);
--   if (eventually_logfile_fd < 0)
-+   if (eventually_logfile_fd < 0) {
-+      VG_(clo_logfile_fd) = 2;
-       VG_(message)(Vg_UserMsg, "valgrind: failed to move logfile fd into safe range");
--   else {
-+   } else {
-       VG_(clo_logfile_fd) = eventually_logfile_fd;
-       VG_(fcntl)(VG_(clo_logfile_fd), VKI_F_SETFD, VKI_FD_CLOEXEC);
-    }
-
diff -ruN valgrind.orig/files/patch-rev329 valgrind/files/patch-rev329
--- valgrind.orig/files/patch-rev329	Sun May 23 19:00:03 2004
+++ valgrind/files/patch-rev329	Thu Jan  1 01:00:00 1970
@@ -1,16 +0,0 @@
---- coregrind/vg_scheduler.c	2004-04-19 09:10:49 UTC (rev 328)
-+++ coregrind/vg_scheduler.c	2004-04-22 08:53:06 UTC (rev 329)
-@@ -1146,7 +1146,12 @@
-                ) {
- 
-                /* If __NR_exit, remember the supplied argument. */
-+#ifdef __linux__
-                VG_(exitcode) = VG_(threads)[tid].m_ebx; /* syscall arg1 */
-+#endif
-+#ifdef __FreeBSD__
-+               VG_(exitcode) = ((UInt*)VG_(threads)[tid].m_esp)[1]; /* syscall arg1 */
-+#endif
- 
-                /* Only run __libc_freeres if the skin says it's ok and
-                   it hasn't been overridden with --run-libc-freeres=no
-
diff -ruN valgrind.orig/pkg-message valgrind/pkg-message
--- valgrind.orig/pkg-message	Sun May 23 19:00:03 2004
+++ valgrind/pkg-message	Fri Jun 25 12:43:02 2004
@@ -1,7 +1,9 @@
-Note: This version of valgrind does not support some older AMD processors.
+Note: This version of valgrind does not support some older processors, 
+      e.g. AMD K6-III, some (?) Pentium II.
+
       If valgrind crashes immediately after it was started with the error
       message "Illegal hardware instruction", your processor is affected by
       this problem.
 
       As a workaround you can use the devel/valgrind-snapshot port, which is
-      based on a more recent snapshot
+      based on a more recent snapshot.
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040725085142.B02193FBC>