[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

WITH_LIB32 still doesn't work for me



On Fri, 19 Nov 2004, Bjoern A. Zeeb wrote:

> it seems I have a patch for this now.

ok, here[1] we go. This one did the trick for me. Please verify and if
someone could test it with NO_KERBEROS= before comitting that would be
good.

I have left the .for-loops though not needed. Seemed better
than substituting _t for all those and lose the "embracement" for
these stages. Seems to be done that way at least in one more place in
that file.

[1] http://sources.zabbadoz.net/freebsd/patchset/amd64-lib32-buildorder.diff

!
! use correct build order:
! 	...obj -> build-tools -> includes -> libraries...
!
Index: Makefile.inc1
===================================================================
RCS file: /local/mirror/FreeBSD/r/ncvs/src/Makefile.inc1,v
retrieving revision 1.456
diff -u -p -r1.456 Makefile.inc1
--- Makefile.inc1	15 Nov 2004 05:59:10 -0000	1.456
+++ Makefile.inc1	19 Nov 2004 19:33:42 -0000
@@ -393,7 +393,7 @@ build32:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.for _t in obj includes
+.for _t in obj
 	cd ${.CURDIR}/include; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 	cd ${.CURDIR}/lib; \
@@ -419,6 +419,22 @@ build32:
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
 .endfor
 .endif
+.for _t in includes
+	cd ${.CURDIR}/include; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/gnu/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.if !defined(NOCRYPT)
+	cd ${.CURDIR}/secure/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.endif
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+	cd ${.CURDIR}/kerberos5/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.endif
+.endfor
 	cd ${.CURDIR}; \
 	    ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries
 .for _t in obj depend all

-- 
Greetings
Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT

Visit your host, monkey.org