From owner-svn-src-head@FreeBSD.ORG Wed Jun 5 10:02:55 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D14C2DEE; Wed, 5 Jun 2013 10:02:55 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-ea0-x236.google.com (mail-ea0-x236.google.com [IPv6:2a00:1450:4013:c01::236]) by mx1.freebsd.org (Postfix) with ESMTP id E5E871F2E; Wed, 5 Jun 2013 10:02:54 +0000 (UTC) Received: by mail-ea0-f182.google.com with SMTP id r16so992903ead.13 for ; Wed, 05 Jun 2013 03:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=2C7hSRjVwx8lEj8BLg243qii04WB9v+2+8C3oNh51Bk=; b=MaLr7wZkry8x5SFiBqZf99kqdj4sZHGS/waoUjDaVMApUAdn32Tq0M18m9e+IfHUz7 5KwM5ij+mlEaKbGma6GEhi6sRBqiYU1sduUJJRn9HlqjGyPs9P1izng4cZTUCTbdQICx OrQ+8xysOFvZD9eLrUTAa5mn5Ld2MHljHA2uayiUJMuGltYPytmO1alZAxvYWBVI+5Tb 43DeA/se+nQ9BSiW3wjlhClZjeYSCb5xqSzbvccZZg+8WFzOubNxhzn2NwAu8ENmMXjx phmkAePrlTiD3wzGji6ScdhiEHelNpFnETkS3K/l5YMnoQFy7cEQ5xlYMR1PWO7pG+sQ WIxA== MIME-Version: 1.0 X-Received: by 10.14.203.7 with SMTP id e7mr10698471eeo.118.1370426574073; Wed, 05 Jun 2013 03:02:54 -0700 (PDT) Received: by 10.15.23.76 with HTTP; Wed, 5 Jun 2013 03:02:53 -0700 (PDT) Received: by 10.15.23.76 with HTTP; Wed, 5 Jun 2013 03:02:53 -0700 (PDT) In-Reply-To: <20130605190925.X1394@besplex.bde.org> References: <201306050533.r555X2dQ047208@svn.freebsd.org> <20130605190925.X1394@besplex.bde.org> Date: Wed, 5 Jun 2013 11:02:53 +0100 Message-ID: Subject: Re: svn commit: r251404 - in head/lib/msun: . src From: Chris Rees To: Bruce Evans Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, David Schultz X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 10:02:55 -0000 On 5 Jun 2013 10:46, "Bruce Evans" wrote: > > On Wed, 5 Jun 2013, Chris Rees wrote: > >> On 5 Jun 2013 06:33, "David Schultz" wrote: >>> >>> ... >>> >>> Log: >>> Style fixes. >>> >>> Submitted by: bde >>> ... >> >> ============================================================================== >>> >>> --- head/lib/msun/Makefile Wed Jun 5 01:22:59 2013 (r251403) >>> +++ head/lib/msun/Makefile Wed Jun 5 05:33:01 2013 (r251404) >>> @@ -21,6 +21,10 @@ ARCH_SUBDIR= ${MACHINE_CPUARCH} >>> .include "${ARCH_SUBDIR}/Makefile.inc" >>> >>> .PATH: ${.CURDIR}/${ARCH_SUBDIR} >>> +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" >>> +.PATH: ${.CURDIR}/x86 >>> +CFLAGS+= -I${.CURDIR}/x86 >>> +.endif >> >> >> Since you're doing style fixes, it is worth noting that quoting strings in >> Makefiles is nearly always incorrect, and only works in our make because of >> an extension. > > > Ugh. make's tutorial even says that strings are required in both of the > above contexts (for .include "file" and for strings in comparison > operations). From /usr/share/doc/psd/12.make: > > @ added ability to use variables in the filenames. An include > @ directive in a makefile looks either like this: > @ @ #include > @ @ or this > @ @ #include "file" > @ @ The difference between the two is where PMake searches for > @ the file: the first way, PMake will look for the file only > @ ... > @ The arithmetic and string operators may only be used to test > @ the value of a variable. The lefthand side must contain the > @ variable expansion, while the righthand side contains either > @ a string, enclosed in double-quotes, or a number. The stan- > @ dard C numeric conventions (except for specifying an octal > @ number) apply to both sides. E.g. > @ @ #if $(OS) == 4.3 > @ @ #if $(MACHINE) == "sun3" > @ @ #if $(LOAD_ADDR) < 0xc000 > @ @ are all valid conditionals. In addition, the numeric value > @ of a variable can be tested as a boolean as follows: > > The tutorial doesn't seem to have been updated for the new make (or > the old make). bmake duplicates the ~20-year old source file except > for about 20 lines of trivial changes, but doesn't seem to build or > install its version. > > I tried building a target named "foo bar". It failed completely. Very little in that guide is at all relevant or correct. Perhaps when it was first written.... It shows some interesting historical notes on the difference between ${} and $(), which is also now wrong. Following quoting rules because of an out of date tutorial and thus diverging from the rest of the world seems a little odd. I can't work out whether you agree or disagree with me from your comment :) Chris