From owner-freebsd-amd64@FreeBSD.ORG Wed Dec 14 18:11:53 2005 Return-Path: X-Original-To: amd64@FreeBSD.org Delivered-To: freebsd-amd64@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F286B16A41F; Wed, 14 Dec 2005 18:11:52 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6895F43D79; Wed, 14 Dec 2005 18:11:39 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id jBEIBaEN075786; Wed, 14 Dec 2005 20:11:37 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 41721-02-9; Wed, 14 Dec 2005 20:11:35 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id jBEI9lgF075642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Dec 2005 20:09:47 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id jBEI9sMb052830; Wed, 14 Dec 2005 20:09:54 +0200 (EET) (envelope-from ru) Date: Wed, 14 Dec 2005 20:09:54 +0200 From: Ruslan Ermilov To: Kirill Ponomarew , Kris Kennaway Message-ID: <20051214180954.GD51686@ip.net.ua> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PmA2V3Z32TCmWXqI" Content-Disposition: inline User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: amd64@FreeBSD.org Subject: [patch] mixed i386/amd64 ports semi-broken X-BeenThere: freebsd-amd64@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting FreeBSD to the AMD64 platform List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Dec 2005 18:11:53 -0000 --PmA2V3Z32TCmWXqI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi there, I hit this problem attempting to install print/acroread7 on amd64. It depends on emulators/linux_base-8, which rewrites ${ARCH} from "amd64" to "i386". Unfortunately, when linux_base-8 is processed in a submake, e.g., when I run "make fetch-recursive" in print/acroread7, no rewrite of ${ARCH} actually happens because bsd.port.mk mistakenly thinks that ${ARCH} can never change, so it's getting passed ARCH already set to "amd64", and as a highest priority command-line type make(1) variable. This results in ${MD5_FILE} improperly set to distinfo.amd64 which doesn't exist. Here's a fix: %%% Index: bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.518 diff -u -p -r1.518 bsd.port.mk --- bsd.port.mk 8 Nov 2005 09:02:51 -0000 1.518 +++ bsd.port.mk 14 Dec 2005 17:54:40 -0000 @@ -5071,7 +5071,6 @@ __softMAKEFLAGS+=3D '${softvar}+=3D${${ .if !defined(NOPRECIOUSMAKEVARS) # These won't change, so we can pass them through the environment .MAKEFLAGS: \ - ARCH=3D"${ARCH:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ OPSYS=3D"${OPSYS:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ OSREL=3D"${OSREL:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ OSVERSION=3D"${OSVERSION:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ %%% Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --PmA2V3Z32TCmWXqI Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDoF/yqRfpzJluFF4RAtxmAJ9zbC6Y53nNK069xEzvQHsGMKcS2QCeNYxK Xolp57KHlMr7nAMccMybEwA= =E2o5 -----END PGP SIGNATURE----- --PmA2V3Z32TCmWXqI--