aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2002-02-11 16:47:05 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2002-02-11 16:47:05 +0000
commit19f56da943da4d0e4530ad85d19f421eccc85efd (patch)
tree4f20e8013191ef3a445c2355a995728d9d23e57c
parent15641a2f41c5e40988d29340e73a7837c83779db (diff)
downloadsrc-19f56da943da4d0e4530ad85d19f421eccc85efd.tar.gz
src-19f56da943da4d0e4530ad85d19f421eccc85efd.zip
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
Notes
Notes: svn path=/head/; revision=90534
-rw-r--r--Makefile.inc13
-rw-r--r--kerberos5/lib/libasn1/Makefile2
-rw-r--r--kerberos5/lib/libroken/Makefile2
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index d263006c951f..816122080468 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -596,7 +596,8 @@ _libroken4= kerberosIV/lib/libroken
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
!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
build-tools:
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index b7fa9e18862b..bc71dad13341 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -83,7 +83,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files
${GEN} krb5_asn1.h: asn1_compile k5.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: \
gen.c \
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 8a3c185ee2bf..71351111915a 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -61,3 +61,5 @@ INCLUDES= roken.h ${KRB5DIR}/lib/roken/roken-common.h
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/roken
+
+build-tools: make-roken