From owner-freebsd-ports@FreeBSD.ORG  Sat Nov 25 09:04:35 2006
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@freebsd.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BC1E916A407;
	Sat, 25 Nov 2006 09:04:35 +0000 (UTC)
	(envelope-from fullermd@over-yonder.net)
Received: from optimus.centralmiss.com (ns.centralmiss.com [206.156.254.79])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D3B2143D5C;
	Sat, 25 Nov 2006 09:03:48 +0000 (GMT)
	(envelope-from fullermd@over-yonder.net)
Received: from draco.over-yonder.net
	(adsl-072-148-013-213.sip.jan.bellsouth.net [72.148.13.213])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by optimus.centralmiss.com (Postfix) with ESMTP id 5965D28434;
	Sat, 25 Nov 2006 03:04:34 -0600 (CST)
Received: by draco.over-yonder.net (Postfix, from userid 100)
	id D0B6D61C36; Sat, 25 Nov 2006 03:04:33 -0600 (CST)
Date: Sat, 25 Nov 2006 03:04:33 -0600
From: "Matthew D. Fuller" <fullermd@over-yonder.net>
To: barner@FreeBSD.org
Message-ID: <20061125090433.GB91673@over-yonder.net>
References: <200611111627.kABGRqbT087375@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200611111627.kABGRqbT087375@repoman.freebsd.org>
X-Editor: vi
X-OS: FreeBSD <http://www.freebsd.org/>
User-Agent: Mutt/1.5.11-fullermd.3
Cc: ports@freebsd.org
Subject: Valgrind failures (was Re: cvs commit: src/sys/sys sched.h)
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Nov 2006 09:04:35 -0000

> trhodes     2006-11-11 16:27:52 UTC
> 
>   Modified files:
>     sys/sys              sched.h 
>   Log:
>   Merge sys/posix4/sched.h into sys/sched.h.
>   
>   Revision  Changes    Path
>   1.29      +77 -3     src/sys/sys/sched.h

This change seems to have broken the build of the valgrind* ports.
The following patch seems to make it build nicely (applies to
valgrind-snapshot with a few lines offset).  Neither appear to
actually work on my Thursday -CURRENT, but I don't guess that's really
related to this change.  Both versions dump core just trying to run on
'ls'.


(The chosen OSVERSION is from an unrelated change ~30 minutes after
the above)


Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/devel/valgrind/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	4 May 2006 21:41:10 -0000	1.21
+++ Makefile	25 Nov 2006 08:42:52 -0000
@@ -87,6 +87,10 @@
 	${FIND} ${WRKSRC} -name "Makefile.in" -exec \
 		${REINPLACE_CMD} -e "s/docs//g" {} \;
 .endif
+.if ${OSVERSION} >= 700025
+	${REINPLACE_CMD} -e "s,posix4/sched\.h,sys/sched\.h," \
+		${WRKSRC}/coregrind/vg_unsafe.h
+.endif
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \



-- 
Matthew Fuller     (MF4839)   |  fullermd@over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.