From owner-freebsd-hackers@FreeBSD.ORG Thu Oct 24 15:17:31 2013 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3838A7B3 for ; Thu, 24 Oct 2013 15:17:31 +0000 (UTC) (envelope-from prvs=1009ce2dcc=killing@multiplay.co.uk) Received: from mail1.multiplay.co.uk (mail1.multiplay.co.uk [85.236.96.23]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CAB3424DE for ; Thu, 24 Oct 2013 15:17:30 +0000 (UTC) Received: from r2d2 ([82.69.141.170]) by mail1.multiplay.co.uk (mail1.multiplay.co.uk [85.236.96.23]) (MDaemon PRO v10.0.4) with ESMTP id md50006495039.msg for ; Thu, 24 Oct 2013 16:17:27 +0100 X-Spam-Processed: mail1.multiplay.co.uk, Thu, 24 Oct 2013 16:17:27 +0100 (not processed: message from valid local sender) X-MDDKIM-Result: neutral (mail1.multiplay.co.uk) X-MDRemoteIP: 82.69.141.170 X-Return-Path: prvs=1009ce2dcc=killing@multiplay.co.uk X-Envelope-From: killing@multiplay.co.uk X-MDaemon-Deliver-To: freebsd-hackers@freebsd.org Message-ID: <5677D36B8E1B460186377C6D1C8B888F@multiplay.co.uk> From: "Steven Hartland" To: , =?iso-8859-1?Q?Dag-Erling_Sm=F8rgrav?= Subject: make buildworld edits contrib/unbound/util/configparser.c on stable-10 Date: Thu, 24 Oct 2013 16:17:26 +0100 MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.5931 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Oct 2013 15:17:31 -0000 Was just about to commit a change to stable-10 when I noticed at the last second that just doing a make buildworld had edited the source file: contrib/unbound/util/configparser.c It seems its overwritten it with a generated version specific to my environment e.g. svn diff contrib/unbound/util/configparser.c |more Index: contrib/unbound/util/configparser.c =================================================================== --- contrib/unbound/util/configparser.c (revision 257053) +++ contrib/unbound/util/configparser.c (working copy) @@ -15,7 +15,7 @@ #define YYPURE 0 -#line 39 "util/configparser.y" +#line 39 "/usr/home/smh/freebsd/base/stable/10/lib/libunbound/../../contrib/unbound/util/configparser.y" #include "config.h" ... Obviously quite a nasty little gotcha as I could have easily broken the build by checking this unknown change in by mistake. @des: sent to you direct as it looks like you did the initial import of unbound so may know whats going on? Regards Steve ================================================ This e.mail is private and confidential between Multiplay (UK) Ltd. and the person or entity to whom it is addressed. In the event of misdirection, the recipient is prohibited from using, copying, printing or otherwise disseminating it or any information contained in it. In the event of misdirection, illegible or incomplete transmission please telephone +44 845 868 1337 or return the E.mail to postmaster@multiplay.co.uk.