Fixed -DMAKE_KERBEROS5 world breakage in kerberos5/lib/libroken
(make-roken is a build tool). This bug was hiding itself after a just fixed bug in cross-linker (binutuils/ld/Makefile,v 1.20). The bug was fatal for cross builds; for example, an alpha binary (make-roken) was attempted to be run on i386. Added make-roken to the list of build-tools in libasn1. It only worked because another build tool needs make-roken implicitly: (build-tools: asn1_compile: print_version.o: roken.h: make-roken). Spotted by: nectar
This commit is contained in:
parent
15641a2f41
commit
19f56da943
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=90534
@ -596,7 +596,8 @@ _libroken4= kerberosIV/lib/libroken
|
|||||||
|
|
||||||
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
|
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
|
||||||
!defined(NOCRYPT) && defined(MAKE_KERBEROS5)
|
!defined(NOCRYPT) && defined(MAKE_KERBEROS5)
|
||||||
_libkrb5= kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
|
_libkrb5= kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl \
|
||||||
|
kerberos5/lib/libroken
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
build-tools:
|
build-tools:
|
||||||
|
@ -83,7 +83,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files
|
|||||||
${GEN} krb5_asn1.h: asn1_compile k5.asn1
|
${GEN} krb5_asn1.h: asn1_compile k5.asn1
|
||||||
./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1
|
./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1
|
||||||
|
|
||||||
build-tools: make-print-version asn1_compile
|
build-tools: make-print-version make-roken asn1_compile
|
||||||
|
|
||||||
asn1_compile: \
|
asn1_compile: \
|
||||||
gen.c \
|
gen.c \
|
||||||
|
@ -61,3 +61,5 @@ INCLUDES= roken.h ${KRB5DIR}/lib/roken/roken-common.h
|
|||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
||||||
.PATH: ${KRB5DIR}/lib/roken
|
.PATH: ${KRB5DIR}/lib/roken
|
||||||
|
|
||||||
|
build-tools: make-roken
|
||||||
|
Loading…
Reference in New Issue
Block a user