Date: Mon, 13 Jun 2005 10:13:38 +0300 From: Ruslan Ermilov <ru@freebsd.org> To: "David O'Brien" <obrien@freebsd.org> Cc: freebsd-amd64@freebsd.org Subject: Re: amd64/82178: missing 32bit subsystem Message-ID: <20050613071337.GA25893@ip.net.ua> In-Reply-To: <20050613021258.GA5242@dragon.NUXI.org> References: <200506122320.j5CNKQAF023114@freefall.freebsd.org> <20050613021258.GA5242@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Jun 12, 2005 at 07:12:58PM -0700, David O'Brien wrote:
> On Sun, Jun 12, 2005 at 11:20:26PM +0000, Steve Kargl wrote:
> > From: Steve Kargl <sgk@troutmask.apl.washington.edu>
>=20
> Actually this isn't correct for 5.4.
> There is a known issue that there are some missing bits in the 5.4
> src/release/Makefile such that the 'base' tarball doesn't contain the
> 32-bit ld.so and 32-bit shared libs.
>=20
This should be fixed in Makefile.inc1, not in release/Makefile.
Try this patch with "make release":
%%%
Index: Makefile
=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/src/Makefile,v
retrieving revision 1.318
diff -u -r1.318 Makefile
--- Makefile 2 Mar 2005 12:33:22 -0000 1.318
+++ Makefile 13 Jun 2005 07:08:27 -0000
@@ -71,7 +71,7 @@
obj objlink regress rerelease tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
- build32 install32
+ build32 distribute32 install32
=20
BITGTS=3D files includes
BITGTS:=3D${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
Index: Makefile.inc1
=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/src/Makefile.inc1,v
retrieving revision 1.497
diff -u -r1.497 Makefile.inc1
--- Makefile.inc1 6 Jun 2005 09:39:46 -0000 1.497
+++ Makefile.inc1 13 Jun 2005 07:09:10 -0000
@@ -435,14 +435,18 @@
PROG=3Dld-elf32.so.1 ${LIB32MAKE} DESTDIR=3D${LIB32TMP} ${_t}
.endfor
=20
-install32:
- mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
- cd ${.CURDIR}/lib; ${LIB32MAKE} install
- cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
+distribute32 install32:
+.if make(distribute32)
+ mkdir -p ${DISTDIR}/base/usr/lib32 # XXX add to mtree
+.else
+ mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
+.endif
+ cd ${.CURDIR}/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
+ cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
.if !defined(NO_CRYPT)
- cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
+ cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
.endif
- cd ${.CURDIR}/libexec/rtld-elf; PROG=3Dld-elf32.so.1 ${LIB32MAKE} install
+ cd ${.CURDIR}/libexec/rtld-elf; PROG=3Dld-elf32.so.1 ${LIB32MAKE} ${.TARG=
ET:S/32$//}
.endif
=20
=20
@@ -550,6 +554,9 @@
@echo ">>> Distributing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
+.if ${TARGET_ARCH} =3D=3D "amd64" && !defined(NO_LIB32)
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32
+.endif
=20
distribution:
cd ${.CURDIR}/etc; ${CROSSENV} PATH=3D${TMPPATH} ${MAKE} distribution
%%%
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--NzB8fVQJ5HfG6fxh
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
iD8DBQFCrTIhqRfpzJluFF4RArtUAJ9KPB++jWVQrArocJ7T4ncPdxQNLQCcCxh5
TWecUianAq1VO8RlwOEfVt4=
=Lyw+
-----END PGP SIGNATURE-----
--NzB8fVQJ5HfG6fxh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050613071337.GA25893>