From nobody@FreeBSD.org  Fri Jun  4 07:49:22 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 492C71065675
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  4 Jun 2010 07:49:22 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 38CAA8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  4 Jun 2010 07:49:22 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o547nLUk099666
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 4 Jun 2010 07:49:21 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o547nLI1099665;
	Fri, 4 Jun 2010 07:49:21 GMT
	(envelope-from nobody)
Message-Id: <201006040749.o547nLI1099665@www.freebsd.org>
Date: Fri, 4 Jun 2010 07:49:21 GMT
From: Erik Cederstrand <erik@cederstrand.dk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Patch for tools/regression/fstest/Makefile
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         147461
>Category:       misc
>Synopsis:       [tools] [patch] Patch for tools/regression/fstest/Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 04 07:50:04 UTC 2010
>Closed-Date:    Fri Jun 04 08:20:20 UTC 2010
>Last-Modified:  Fri Jun  4 08:30:06 UTC 2010
>Originator:     Erik Cederstrand
>Release:        FreeBSD CURRENT
>Organization:
>Environment:
FreeBSD clangbsd.local 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r208730: Wed Jun  2 19:10:36 CEST 2010     erik@clangbsd.local:/usr/obj/usr/home/erik/freebsd/clang/src/sys/GENERIC  amd64
>Description:
This is a patch for tools/regression/fstest/Makefile to rewrite it from gmake syntax to standard BSD syntax, so it can be run using just "make". It currently exits with syntax errors.
>How-To-Repeat:
cd src/tools/regression/fstest/Makefile
make
>Fix:
Apply patch or use gmake

Patch attached with submission follows:

Index: tools/regression/fstest/Makefile
===================================================================
--- tools/regression/fstest/Makefile	(revision 208730)
+++ tools/regression/fstest/Makefile	(working copy)
@@ -1,26 +1,23 @@
 # $FreeBSD$
 
-OSTYPE=$(shell uname)
+OSTYPE!= uname
 
-ifeq "${OSTYPE}" "FreeBSD"
-CFLAGS += -D__OS_FreeBSD__
-CFLAGS += -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL
-endif
+.if ${OSTYPE} == "FreeBSD"
+CFLAGS+= -D__OS_FreeBSD__
+CFLAGS+= -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL
 
-ifeq "${OSTYPE}" "SunOS"
-CFLAGS += -D__OS_Solaris__
-CFLAGS += -DHAS_TRUNCATE64 -DHAS_STAT64
-endif
+.elif ${OSTYPE} == "SunOS"
+CFLAGS+= -D__OS_Solaris__
+CFLAGS+= -DHAS_TRUNCATE64 -DHAS_STAT64
 
-ifeq "${OSTYPE}" "Darwin"
-CFLAGS += -D__OS_Darwin__
-CFLAGS += -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS
-endif
+.elif ${OSTYPE} == "Darwin"
+CFLAGS+= -D__OS_Darwin__
+CFLAGS+= -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS
 
-ifeq "${OSTYPE}" "Linux"
-CFLAGS += -D__OS_Linux__
-CFLAGS += -D_GNU_SOURCE
-endif
+.elif ${OSTYPE} == "Linux"
+CFLAGS+= -D__OS_Linux__
+CFLAGS+= -D_GNU_SOURCE
+.endif
 
 all:	fstest
 


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: maxim 
State-Changed-When: Fri Jun 4 08:20:02 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147461 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/147461: commit references a PR
Date: Fri,  4 Jun 2010 08:19:58 +0000 (UTC)

 Author: maxim
 Date: Fri Jun  4 08:19:43 2010
 New Revision: 208798
 URL: http://svn.freebsd.org/changeset/base/208798
 
 Log:
   o Makefile BSDfication.
   
   PR:		misc/147461 (with my changes)
   Submitted by:	Erik Cederstrand
 
 Modified:
   head/tools/regression/fstest/Makefile
 
 Modified: head/tools/regression/fstest/Makefile
 ==============================================================================
 --- head/tools/regression/fstest/Makefile	Fri Jun  4 08:14:30 2010	(r208797)
 +++ head/tools/regression/fstest/Makefile	Fri Jun  4 08:19:43 2010	(r208798)
 @@ -1,31 +1,25 @@
  # $FreeBSD$
  
 -OSTYPE=$(shell uname)
 +PROG=	fstest
 +NO_MAN=
  
 -ifeq "${OSTYPE}" "FreeBSD"
 -CFLAGS += -D__OS_FreeBSD__
 -CFLAGS += -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL
 -endif
 -
 -ifeq "${OSTYPE}" "SunOS"
 -CFLAGS += -D__OS_Solaris__
 -CFLAGS += -DHAS_TRUNCATE64 -DHAS_STAT64
 -endif
 -
 -ifeq "${OSTYPE}" "Darwin"
 -CFLAGS += -D__OS_Darwin__
 -CFLAGS += -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS
 -endif
 -
 -ifeq "${OSTYPE}" "Linux"
 -CFLAGS += -D__OS_Linux__
 -CFLAGS += -D_GNU_SOURCE
 -endif
 +OSTYPE!= uname
  
 -all:	fstest
 +.if ${OSTYPE} == "FreeBSD"
 +CFLAGS+= -D__OS_FreeBSD__
 +CFLAGS+= -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL
  
 -fstest:	fstest.c
 -	gcc -Wall ${CFLAGS} fstest.c -o fstest
 +.elif ${OSTYPE} == "SunOS"
 +CFLAGS+= -D__OS_Solaris__
 +CFLAGS+= -DHAS_TRUNCATE64 -DHAS_STAT64
  
 -clean:
 -	rm -f fstest
 +.elif ${OSTYPE} == "Darwin"
 +CFLAGS+= -D__OS_Darwin__
 +CFLAGS+= -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS
 +
 +.elif ${OSTYPE} == "Linux"
 +CFLAGS+= -D__OS_Linux__
 +CFLAGS+= -D_GNU_SOURCE
 +.endif
 +
 +.include <bsd.prog.mk>
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
