Date: Wed, 14 Dec 2005 20:09:54 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Kirill Ponomarew <krion@FreeBSD.org>, Kris Kennaway <kris@FreeBSD.org> Cc: amd64@FreeBSD.org Subject: [patch] mixed i386/amd64 ports semi-broken Message-ID: <20051214180954.GD51686@ip.net.ua>
next in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051214180954.GD51686>