In the amd64 hybrid libraries case, move the kerberos5 tools to before
building the kerberos5 includes. This is not the same patch that Bjoern A. Zeeb came up with, but the credit still goes to him for finding the problem. Thanks!
This commit is contained in:
parent
694f13aaff
commit
63d76a5f0d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=137951
@ -393,6 +393,12 @@ build32:
|
|||||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
|
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
|
||||||
-p ${LIB32TMP}/usr/include >/dev/null
|
-p ${LIB32TMP}/usr/include >/dev/null
|
||||||
ln -sf ${.CURDIR}/sys ${WORLDTMP}
|
ln -sf ${.CURDIR}/sys ${WORLDTMP}
|
||||||
|
.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||||
|
.for _t in obj depend all
|
||||||
|
cd ${.CURDIR}/kerberos5/tools; \
|
||||||
|
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
|
||||||
|
.endfor
|
||||||
|
.endif
|
||||||
.for _t in obj includes
|
.for _t in obj includes
|
||||||
cd ${.CURDIR}/include; \
|
cd ${.CURDIR}/include; \
|
||||||
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
|
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
|
||||||
@ -413,12 +419,6 @@ build32:
|
|||||||
cd ${.CURDIR}/${_dir}; \
|
cd ${.CURDIR}/${_dir}; \
|
||||||
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
|
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
|
||||||
.endfor
|
.endfor
|
||||||
.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
|
||||||
.for _t in obj depend all
|
|
||||||
cd ${.CURDIR}/kerberos5/tools; \
|
|
||||||
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
|
|
||||||
.endfor
|
|
||||||
.endif
|
|
||||||
cd ${.CURDIR}; \
|
cd ${.CURDIR}; \
|
||||||
${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries
|
${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries
|
||||||
.for _t in obj depend all
|
.for _t in obj depend all
|
||||||
|
Loading…
Reference in New Issue
Block a user