amd64/82178: missing 32bit subsystem

[Ruslan Ermilov]

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 at troutmask.apl.washington.edu>
> 
> 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.
> 
This should be fixed in Makefile.inc1, not in release/Makefile.
Try this patch with "make release":

%%%
Index: Makefile
===================================================================
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
 
 BITGTS=	files includes
 BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
Index: Makefile.inc1
===================================================================
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=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endfor
 
-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=ld-elf32.so.1 ${LIB32MAKE} install
+	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//}
 .endif
 
 
@@ -550,6 +554,9 @@
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
+.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32
+.endif
 
 distribution:
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} distribution
%%%


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-amd64/attachments/20050613/87b2ce3b/attachment.bin