From owner-freebsd-stable@FreeBSD.ORG  Tue Apr  2 13:34:04 2013
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@FreeBSD.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 81048462
 for <freebsd-stable@FreeBSD.org>; Tue,  2 Apr 2013 13:34:04 +0000 (UTC)
 (envelope-from ian@FreeBSD.org)
Received: from mho-02-ewr.mailhop.org (mho-02-ewr.mailhop.org [204.13.248.72])
 by mx1.freebsd.org (Postfix) with ESMTP id 5B2BE2D5
 for <freebsd-stable@FreeBSD.org>; Tue,  2 Apr 2013 13:34:04 +0000 (UTC)
Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52]
 helo=damnhippie.dyndns.org)
 by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256)
 (Exim 4.72) (envelope-from <ian@FreeBSD.org>)
 id 1UN1LZ-0003ba-Ln; Tue, 02 Apr 2013 13:33:57 +0000
Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240])
 by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id r32DXsxr019615;
 Tue, 2 Apr 2013 07:33:54 -0600 (MDT) (envelope-from ian@FreeBSD.org)
X-Mail-Handler: Dyn Standard SMTP by Dyn
X-Originating-IP: 24.8.230.52
X-Report-Abuse-To: abuse@dyndns.com (see
 http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse
 reporting information)
X-MHO-User: U2FsdGVkX192uw+6u8De0CnNOMl4g7v5
Subject: Re: 9-STABLE buildworld compile error
From: Ian Lepore <ian@FreeBSD.org>
To: Dmitry Luhtionov <dmitryluhtionov@gmail.com>
In-Reply-To: <CAAYMRQdPNEUfFb1sLkLjXhiFNj+orG-tO7zpo+_809-WcCFEdg@mail.gmail.com>
References: <CAAYMRQdPNEUfFb1sLkLjXhiFNj+orG-tO7zpo+_809-WcCFEdg@mail.gmail.com>
Content-Type: text/plain; charset="us-ascii"
Date: Tue, 02 Apr 2013 07:33:54 -0600
Message-ID: <1364909634.1312.21.camel@revolution.hippie.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 
Content-Transfer-Encoding: 7bit
Cc: freebsd-stable@FreeBSD.org
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Apr 2013 13:34:04 -0000

On Tue, 2013-04-02 at 14:28 +0300, Dmitry Luhtionov wrote:
> When I put MALLOC_PRODUCTION=yes in /etc/make/conf, make buildworld hangs
> with error
> /usr/src/lib/libc/stdlib/
> malloc.c:126:1: error: "MALLOC_PRODUCTION" redefined
> <command-line>: error: this is the location of the previous definition
> 
> This is a patch, which avoid this error
> 
> --- /usr/src/lib/libc/stdlib/Makefile.inc.orig    2012-12-04
> 11:53:28.000000000 +0200
> +++ /usr/src/lib/libc/stdlib/Makefile.inc    2013-04-02 14:14:35.000000000
> +0300
> @@ -51,7 +51,3 @@
>      malloc.3 realloc.3 malloc.3 reallocf.3 malloc.3 malloc_usable_size.3
>  MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3
> 
> -.if defined(MALLOC_PRODUCTION)
> -CFLAGS+=    -DMALLOC_PRODUCTION
> -.endif
> -

That's because MALLOC_PRODUCTION is already defined in -stable.  

The right fix would be to remove it from your make.conf, because it's no
longer necessary in -current either -- the performance problems that
originally led to the advice to put MALLOC_PRODUCTION in make.conf for
-current have been fixed.

-- Ian