summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2014-02-20 20:51:27 +0000
committerpeter <peter@FreeBSD.org>2014-02-20 20:51:27 +0000
commit2cdcb70a203b158b33024104eb4d31b42410fc5b (patch)
tree4ce6acf983632b534f2cf8e4a5385dda4a59c6d6
parent7cfbe47f2542407346168136f8e33b5015eda94f (diff)
downloadFreeBSD-src-2cdcb70a203b158b33024104eb4d31b42410fc5b.zip
FreeBSD-src-2cdcb70a203b158b33024104eb4d31b42410fc5b.tar.gz
MFC r262253: hack to prevent concurrent runs of asn1_compile in the Heimdal
build with high -j concurrency.
-rw-r--r--kerberos5/lib/libasn1/Makefile9
-rw-r--r--kerberos5/lib/libgssapi_spnego/Makefile1
-rw-r--r--kerberos5/lib/libhdb/Makefile1
-rw-r--r--kerberos5/lib/libhx509/Makefile3
4 files changed, 14 insertions, 0 deletions
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 94c79db..b0f969a 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -56,10 +56,12 @@ INCS+= krb5_asn1.h \
digest_asn1.h \
kx509_asn1.h
+.ORDER: ${GEN_CMS}
${GEN_CMS}: cms.asn1 cms.opt
${ASN1_COMPILE} --one-code-file \
--option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1
+.ORDER: ${GEN_RFC2459}
${GEN_RFC2459}: rfc2459.asn1
${ASN1_COMPILE} \
--one-code-file \
@@ -70,32 +72,39 @@ ${GEN_RFC2459}: rfc2459.asn1
--sequence=Extensions \
--sequence=CRLDistributionPoints ${.ALLSRC:M*.asn1} rfc2459_asn1
+.ORDER: ${GEN_K5}
${GEN_K5}: krb5.asn1 krb5.opt
${ASN1_COMPILE} \
--one-code-file \
--option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} krb5_asn1
+.ORDER: ${GEN_PKINIT}
${GEN_PKINIT}: pkinit.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkinit_asn1
+.ORDER: ${GEN_PKCS8}
${GEN_PKCS8}: pkcs8.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs8_asn1
+.ORDER: ${GEN_PKCS9}
${GEN_PKCS9}: pkcs9.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs9_asn1
+.ORDER: ${GEN_PKCS12}
${GEN_PKCS12}: pkcs12.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs12_asn1
+.ORDER: ${GEN_DIGEST}
${GEN_DIGEST}: digest.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} digest_asn1
+.ORDER: ${GEN_KX509}
${GEN_KX509}: kx509.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} kx509_asn1
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
index 00d299e..9dbd05d 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -38,6 +38,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I.
CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \
spnego_asn1_files spnego_asn1-template.c
+.ORDER: ${GEN}
${GEN}: spnego.asn1 spnego.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} spnego_asn1
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 87a72dd..b7a51da 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -84,6 +84,7 @@ GEN= asn1_Salt.x \
CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \
hdb_asn1-template.[ch]*
+.ORDER: ${GEN}
${GEN}: hdb.asn1
${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index 469950a..04eb1c1 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -269,14 +269,17 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \
INCS+= ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h
+.ORDER: ${GEN_OSCP}
${GEN_OCSP}: ocsp.asn1 ocsp.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} ocsp_asn1
+.ORDER: ${GEN_PKCS10}
${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} pkcs10_asn1
+.ORDER: ${GEN_CRMF}
${GEN_CRMF}: crmf.asn1
${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1
OpenPOWER on IntegriCloud