From: Andrew Bartlett Date: Tue, 15 Jun 2021 03:24:17 +0000 (+1200) Subject: heimdal_build: Use lib/asn1/rfc2459.opt rather than hard-coded X-Git-Tag: tevent-0.11.0~368 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f724a9f9bb5cf133bb21222cdc23eaad57eed85;p=thirdparty%2Fsamba.git heimdal_build: Use lib/asn1/rfc2459.opt rather than hard-coded Based on patch by Stefan Metzmacher in his Heimdal upgrade branch lib/asn1/rfc2459.opt imported from lorikeet-heimdal-abartlet/lorikeet-heimdal-201107241840-plus-recent-changes which is the closest tree I could find, and matches the options being removed from the wscript_build file. Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Jun 15 23:25:27 UTC 2021 on sn-devel-184 --- diff --git a/source4/heimdal/lib/asn1/rfc2459.opt b/source4/heimdal/lib/asn1/rfc2459.opt new file mode 100644 index 00000000000..d3afc673943 --- /dev/null +++ b/source4/heimdal/lib/asn1/rfc2459.opt @@ -0,0 +1,6 @@ +--preserve-binary=TBSCertificate +--preserve-binary=TBSCRLCertList +--preserve-binary=Name +--sequence=GeneralNames +--sequence=Extensions +--sequence=CRLDistributionPoints diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 8e94fc154ab..28a1fb5240d 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -704,7 +704,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_ASN1"): HEIMDAL_ASN1('HEIMDAL_RFC2459_ASN1', 'lib/asn1/rfc2459.asn1', - options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints', + option_file='lib/asn1/rfc2459.opt', directory='lib/asn1' )