Page MenuHomeFreeBSD
Files F151337793

D50952.diff
No OneTemporary
Actions

D50952.diff
View Options

diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -40,6 +40,7 @@
${_ET}.c: .NOMETA
${_ET}.h ${_ET}.c: ${ET}
compile_et ${.ALLSRC}
+ ${ASN1_FIXUP} ${_ET}.h ${_ET}.c
CLEANFILES+= ${_ET}.h ${_ET}.c
.endif
.endfor
@@ -48,5 +49,7 @@
.endif # defined(SRCS)
ASN1_COMPILE= asn1_compile
+# Avoid hard-coding absolute paths in generated files.
+ASN1_FIXUP= sed -i '' 's|^/\* Generated from ${SRCTOP}|/* Generated from .|'
MAKE_ROKEN= make-roken
SLC= slc
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -61,6 +61,7 @@
${GEN_CMS}: cms.asn1 cms.opt
${ASN1_COMPILE} --one-code-file \
--option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1
+ ${ASN1_FIXUP} ${GEN_CMS}
.ORDER: ${GEN_RFC2459}
${GEN_RFC2459:[2..-1]}: .NOMETA
@@ -73,6 +74,7 @@
--sequence=GeneralNames \
--sequence=Extensions \
--sequence=CRLDistributionPoints ${.ALLSRC:M*.asn1} rfc2459_asn1
+ ${ASN1_FIXUP} ${GEN_RFC2459}
.ORDER: ${GEN_K5}
${GEN_K5:[2..-1]}: .NOMETA
@@ -81,42 +83,49 @@
--one-code-file \
--option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} krb5_asn1
+ ${ASN1_FIXUP} ${GEN_K5}
.ORDER: ${GEN_PKINIT}
${GEN_PKINIT:[2..-1]}: .NOMETA
${GEN_PKINIT}: pkinit.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkinit_asn1
+ ${ASN1_FIXUP} ${GEN_PKINIT}
.ORDER: ${GEN_PKCS8}
${GEN_PKCS8:[2..-1]}: .NOMETA
${GEN_PKCS8}: pkcs8.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs8_asn1
+ ${ASN1_FIXUP} ${GEN_PKCS8}
.ORDER: ${GEN_PKCS9}
${GEN_PKCS9:[2..-1]}: .NOMETA
${GEN_PKCS9}: pkcs9.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs9_asn1
+ ${ASN1_FIXUP} ${GEN_PKCS9}
.ORDER: ${GEN_PKCS12}
${GEN_PKCS12:[2..-1]}: .NOMETA
${GEN_PKCS12}: pkcs12.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs12_asn1
+ ${ASN1_FIXUP} ${GEN_PKCS12}
.ORDER: ${GEN_DIGEST}
${GEN_DIGEST:[2..-1]}: .NOMETA
${GEN_DIGEST}: digest.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} digest_asn1
+ ${ASN1_FIXUP} ${GEN_DIGEST}
.ORDER: ${GEN_KX509}
${GEN_KX509:[2..-1]}: .NOMETA
${GEN_KX509}: kx509.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} kx509_asn1
+ ${ASN1_FIXUP} ${GEN_KX509}
.SUFFIXES: .h .c .x .hx
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -41,7 +41,8 @@
${GEN:[2..-1]}: .NOMETA
${GEN}: spnego.asn1 spnego.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
- ${.ALLSRC:M*.asn1} spnego_asn1
+ ${.ALLSRC:M*.asn1} spnego_asn1
+ ${ASN1_FIXUP} ${GEN}
.SUFFIXES: .h .c .x .hx
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -91,6 +91,7 @@
${GEN:[2..-1]}: .NOMETA
${GEN}: hdb.asn1
${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1
+ ${ASN1_FIXUP} ${GEN}
.SUFFIXES: .h .c .x .hx
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -275,22 +275,25 @@
${GEN_OCSP:[2..-1]}: .NOMETA
${GEN_OCSP}: ocsp.asn1 ocsp.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
- ${.ALLSRC:M*.asn1} ocsp_asn1
+ ${.ALLSRC:M*.asn1} ocsp_asn1
+ ${ASN1_FIXUP} ${GEN_OCSP}
.ORDER: ${GEN_PKCS10}
${GEN_PKCS10:[2..-1]}: .NOMETA
${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
- ${.ALLSRC:M*.asn1} pkcs10_asn1
+ ${.ALLSRC:M*.asn1} pkcs10_asn1
+ ${ASN1_FIXUP} ${GEN_PKCS10}
.ORDER: ${GEN_CRMF}
${GEN_CRMF:[2..-1]}: .NOMETA
${GEN_CRMF}: crmf.asn1
${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1
+ ${ASN1_FIXUP} ${GEN_CRMF}
.SUFFIXES: .h .c .x .hx
-.x.c:
+.x.c:
${CP} ${.IMPSRC} ${.TARGET}
.hx.h:

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 5:04 PM (4 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31108971
Default Alt Text
D50952.diff (3 KB)

Event Timeline