packages: heimdal/heimdal.spec, heimdal/heimdal-make.patch (NEW) - attempt ...

baggins baggins at pld-linux.org
Sat Oct 2 12:10:25 CEST 2010


Author: baggins                      Date: Sat Oct  2 10:10:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- attempt to fix parallel build

---- Files affected:
packages/heimdal:
   heimdal.spec (1.206 -> 1.207) , heimdal-make.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.206 packages/heimdal/heimdal.spec:1.207
--- packages/heimdal/heimdal.spec:1.206	Sat Oct  2 11:18:59 2010
+++ packages/heimdal/heimdal.spec	Sat Oct  2 12:10:20 2010
@@ -31,6 +31,7 @@
 Patch4:		%{name}-db4.patch
 Patch5:		%{name}-libadd.patch
 Patch6:		%{name}-signal.patch
+Patch7:		%{name}-make.patch
 Patch8:		%{name}-info.patch
 Patch9:		%{name}-shared-libcom_err.patch
 Patch10:	%{name}-sbindir.patch
@@ -356,6 +357,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -382,9 +384,6 @@
 	--with-sqlite3=/usr \
 	--with%{!?with_x11:out}-x
 
-# Makefile lacks proper deps so without it multi-job make sometimes fails
-%{__make} -C lib/kadm5 kadm5_err.h
-
 %{__make}
 
 %install
@@ -791,6 +790,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.207  2010/10/02 10:10:20  baggins
+- attempt to fix parallel build
+
 Revision 1.206  2010/10/02 09:18:59  baggins
 - updated to 1.4
 

================================================================
Index: packages/heimdal/heimdal-make.patch
diff -u /dev/null packages/heimdal/heimdal-make.patch:1.1
--- /dev/null	Sat Oct  2 12:10:25 2010
+++ packages/heimdal/heimdal-make.patch	Sat Oct  2 12:10:20 2010
@@ -0,0 +1,29 @@
+--- heimdal-1.4/lib/asn1/Makefile.am~	2010-09-13 09:23:34.000000000 +0200
++++ heimdal-1.4/lib/asn1/Makefile.am	2010-10-02 12:08:31.833815205 +0200
+@@ -641,16 +641,16 @@
+ 
+ asn1parse.h: asn1parse.c
+ 
+-$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx: krb5_asn1_files
+-$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx: pkinit_asn1_files
+-$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx: pkcs8_asn1_files
+-$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx: pkcs9_asn1_files
+-$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx: pkcs12_asn1_files
+-$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files
+-$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files
+-$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files
+-$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files
+-$(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files
++$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx krb5_asn1-template.c: krb5_asn1_files
++$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx pkinit_asn1-template.c: pkinit_asn1_files
++$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx pkcs8_asn1-template.c: pkcs8_asn1_files
++$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx pkcs9_asn1-template.c: pkcs9_asn1_files
++$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx pkcs12_asn1-template.c: pkcs12_asn1_files
++$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx digest_asn1-template.c: digest_asn1_files
++$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx kx509_asn1-template.c: kx509_asn1_files
++$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx rfc2459_asn1-template.c: rfc2459_asn1_files
++$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx cms_asn1-template.c: cms_asn1_files
++$(gen_files_test) test_asn1.hx test_asn1-priv.hx test_asn1-template.c: test_asn1_files
+ 
+ rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
+ 	$(ASN1_COMPILE) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.206&r2=1.207&f=u



More information about the pld-cvs-commit mailing list