From owner-freebsd-bugs@FreeBSD.ORG Fri Jun 4 07:50:04 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F093106564A for ; Fri, 4 Jun 2010 07:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7D3F78FC14 for ; Fri, 4 Jun 2010 07:50:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o547o4GN031744 for ; Fri, 4 Jun 2010 07:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o547o4xP031743; Fri, 4 Jun 2010 07:50:04 GMT (envelope-from gnats) Resent-Date: Fri, 4 Jun 2010 07:50:04 GMT Resent-Message-Id: <201006040750.o547o4xP031743@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erik Cederstrand Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 492C71065675 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/147461: Patch for tools/regression/fstest/Makefile X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 07:50:04 -0000 >Number: 147461 >Category: misc >Synopsis: Patch for tools/regression/fstest/Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 04 07:50:04 UTC 2010 >Closed-Date: >Last-Modified: >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: >Unformatted: