From owner-freebsd-bugs@FreeBSD.ORG Mon Dec 6 20:40:09 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 A0572106564A for ; Mon, 6 Dec 2010 20:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 78EB28FC1A for ; Mon, 6 Dec 2010 20:40:09 +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 oB6Ke9lM062451 for ; Mon, 6 Dec 2010 20:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oB6Ke9Lh062450; Mon, 6 Dec 2010 20:40:09 GMT (envelope-from gnats) Resent-Date: Mon, 6 Dec 2010 20:40:09 GMT Resent-Message-Id: <201012062040.oB6Ke9Lh062450@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, Eitan Adler Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6923B1065670 for ; Mon, 6 Dec 2010 20:36:55 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-qy0-f175.google.com (mail-qy0-f175.google.com [209.85.216.175]) by mx1.freebsd.org (Postfix) with ESMTP id 302EC8FC0C for ; Mon, 6 Dec 2010 20:36:54 +0000 (UTC) Received: by qyk8 with SMTP id 8so3700588qyk.13 for ; Mon, 06 Dec 2010 12:36:53 -0800 (PST) Received: by 10.224.6.65 with SMTP id 1mr2388839qay.244.1291667813487; Mon, 06 Dec 2010 12:36:53 -0800 (PST) Received: from (bing54.oneida-a.binghamton.edu [128.226.195.54]) by mx.google.com with ESMTPS id nb14sm3813907qcb.12.2010.12.06.12.36.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 06 Dec 2010 12:36:52 -0800 (PST) Received: by (sSMTP sendmail emulation); Mon, 06 Dec 2010 15:36:49 -0500 Message-Id: <4cfd4964.cefde50a.2dfd.ffffd07b@mx.google.com> Date: Mon, 06 Dec 2010 15:36:49 -0500 From: Eitan Adler To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/152871: [patch] Request for exp-run and comment X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Eitan Adler List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2010 20:40:09 -0000 >Number: 152871 >Category: bin >Synopsis: [patch] Request for exp-run and comment >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 06 20:40:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Eitan Adler >Release: FreeBSD >Organization: >Environment: This is a request for an exp run and comments about this patch. >Description: I noticed a line in bsd.port.mk "Kludge for pre-3.0 systems" # Kludge for pre-3.0 ystems MACHINE_ARCH?= i386 According to cvs blame asami@ added both lines in revision 1.306 in 1999 Furthermore in bsd.port.mk it says ports should test against ARCH and not MACHINE_ARCH but bsd.port.subdir.mk uses MACHINE_ARCH on line 209. bsd.gnustep.mk has a similar test for MACHINE_ARCH instead of ARCH on line 136 (r1.1 by dinoex) 1) Should the initial line be removed 2) Should bsd.port.subdir.mk be changed to use ARCH instead? 3) Should bsd.gnustep.mk be changed to use ARCH instead? Overall I've been finding lots of inconsistent old hacks in bsd.*.mk and its difficult to tell which ones are still needed and which ones are not :-( >How-To-Repeat: >Fix: --- remove-machine-arch.patch begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.660 diff -u -r1.660 bsd.port.mk --- bsd.port.mk 4 Dec 2010 07:30:13 -0000 1.660 +++ bsd.port.mk 6 Dec 2010 02:49:24 -0000 @@ -38,9 +38,7 @@ # different actions for different values. # # ARCH - The architecture of the target machine, such as would be -# returned by "uname -p". (Note: Ports should test against -# ARCH, and not the host machine's architecture which is -# MACHINE_ARCH, to enable ports to be cross-built.) +# returned by "uname -p". # OPSYS - Portability clause. This is the operating system the # makefile is being used on. Automatically set to # "FreeBSD," "NetBSD," or "OpenBSD" as appropriate. @@ -1208,9 +1206,6 @@ ARCH!= ${UNAME} -p .endif -# Kludge for pre-3.0 systems -MACHINE_ARCH?= i386 - # Get the operating system type .if !defined(OPSYS) OPSYS!= ${UNAME} -s Index: bsd.gnustep.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.gnustep.mk,v retrieving revision 1.63 diff -u -r1.63 bsd.gnustep.mk --- bsd.gnustep.mk 11 Jun 2010 09:12:37 -0000 1.63 +++ bsd.gnustep.mk 6 Dec 2010 02:49:24 -0000 @@ -133,10 +133,10 @@ GNUSTEP_ART_PORT?= x11-toolkits/gnustep-art GNUSTEP_CAIRO_PORT?= x11-toolkits/gnustep-cairo -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" GNU_ARCH= ix86 .else -GNU_ARCH= ${MACHINE_ARCH} +GNU_ARCH= ${ARCH} .endif .if !defined(USE_MAKEFILE) Index: bsd.port.subdir.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.subdir.mk,v retrieving revision 1.76 diff -u -r1.76 bsd.port.subdir.mk --- bsd.port.subdir.mk 25 May 2010 15:18:06 -0000 1.76 +++ bsd.port.subdir.mk 6 Dec 2010 02:49:24 -0000 @@ -206,8 +206,8 @@ ${ECHO_MSG} "===> ${DIRPRFX}$$sub skipped"; \ fi; \ done; \ - if test -d ${.CURDIR}/$${sub}.${MACHINE_ARCH}; then \ - edir=$${sub}.${MACHINE_ARCH}; \ + if test -d ${.CURDIR}/$${sub}.${ARCH}; then \ + edir=$${sub}.${ARCH}; \ elif test -d ${.CURDIR}/$${sub}; then \ edir=$${sub}; \ else \ --- remove-machine-arch.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: