Skip to content

Commit 7ea53c9

Browse files
tobiasb-mstobiasb-ms
authored
ldns fix intermittent build failure (#12516)
1 parent c45bed2 commit 7ea53c9

2 files changed

Lines changed: 90 additions & 2 deletions

File tree

‎SPECS/ldns/fix-intermittent-build-failure-with-milti-job-build.patch‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
From 9303f1876b660d18118cd5b09ba616d01bc31610 Mon Sep 17 00:00:00 2001
2+
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
3+
Date: Thu, 20 Feb 2025 10:28:40 +0100
4+
Subject: [PATCH] * Fix #271: Intermittent build failure with multi-job builds
5+
(make -j).
6+
7+
---
8+
Makefile.in | 54 ++++++++++++++++++++++++++---------------------------
9+
1 file changed, 27 insertions(+), 27 deletions(-)
10+
11+
diff --git a/Makefile.in b/Makefile.in
12+
index 57957d0..e89d4b0 100644
13+
--- a/Makefile.in
14+
+++ b/Makefile.in
15+
@@ -566,9 +566,9 @@ depend:
16+
done; \
17+
done
18+
for p in $(EXAMPLE_PROGS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS); do \
19+
- echo "$$p: $$p.lo $$p.o \$$(LIB)" >> $(DEPEND_TMP) ; done
20+
+ echo "$$p: $$p.lo \$$(LIB)" >> $(DEPEND_TMP) ; done
21+
echo "$(TESTNS): `for o in $(TESTNS_LOBJS) ; do \
22+
- echo -n "$$o $${o%lo}o " ; done` \$$(LIB)" \
23+
+ echo -n "$$o " ; done`\$$(LIB)" \
24+
>> $(DEPEND_TMP)
25+
cp $(DEPEND_TARGET) $(DEPEND_TMP2)
26+
head -`egrep -n "# Dependencies" $(DEPEND_TARGET) | tail -1 | sed -e 's/:.*$$//'` $(DEPEND_TMP2) > $(DEPEND_TARGET)
27+
@@ -1108,28 +1108,28 @@ drill/work.lo drill/work.o: $(srcdir)/drill/work.c $(srcdir)/drill/drill.h ldns/
28+
$(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \
29+
$(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \
30+
$(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h
31+
-examples/ldns-chaos: examples/ldns-chaos.lo examples/ldns-chaos.o $(LIB)
32+
-examples/ldns-compare-zones: examples/ldns-compare-zones.lo examples/ldns-compare-zones.o $(LIB)
33+
-examples/ldnsd: examples/ldnsd.lo examples/ldnsd.o $(LIB)
34+
-examples/ldns-gen-zone: examples/ldns-gen-zone.lo examples/ldns-gen-zone.o $(LIB)
35+
-examples/ldns-key2ds: examples/ldns-key2ds.lo examples/ldns-key2ds.o $(LIB)
36+
-examples/ldns-keyfetcher: examples/ldns-keyfetcher.lo examples/ldns-keyfetcher.o $(LIB)
37+
-examples/ldns-keygen: examples/ldns-keygen.lo examples/ldns-keygen.o $(LIB)
38+
-examples/ldns-mx: examples/ldns-mx.lo examples/ldns-mx.o $(LIB)
39+
-examples/ldns-notify: examples/ldns-notify.lo examples/ldns-notify.o $(LIB)
40+
-examples/ldns-read-zone: examples/ldns-read-zone.lo examples/ldns-read-zone.o $(LIB)
41+
-examples/ldns-resolver: examples/ldns-resolver.lo examples/ldns-resolver.o $(LIB)
42+
-examples/ldns-rrsig: examples/ldns-rrsig.lo examples/ldns-rrsig.o $(LIB)
43+
-examples/ldns-test-edns: examples/ldns-test-edns.lo examples/ldns-test-edns.o $(LIB)
44+
-examples/ldns-update: examples/ldns-update.lo examples/ldns-update.o $(LIB)
45+
-examples/ldns-version: examples/ldns-version.lo examples/ldns-version.o $(LIB)
46+
-examples/ldns-walk: examples/ldns-walk.lo examples/ldns-walk.o $(LIB)
47+
-examples/ldns-zcat: examples/ldns-zcat.lo examples/ldns-zcat.o $(LIB)
48+
-examples/ldns-zsplit: examples/ldns-zsplit.lo examples/ldns-zsplit.o $(LIB)
49+
-examples/ldns-dpa: examples/ldns-dpa.lo examples/ldns-dpa.o $(LIB)
50+
-examples/ldns-dane: examples/ldns-dane.lo examples/ldns-dane.o $(LIB)
51+
-examples/ldns-nsec3-hash: examples/ldns-nsec3-hash.lo examples/ldns-nsec3-hash.o $(LIB)
52+
-examples/ldns-revoke: examples/ldns-revoke.lo examples/ldns-revoke.o $(LIB)
53+
-examples/ldns-signzone: examples/ldns-signzone.lo examples/ldns-signzone.o $(LIB)
54+
-examples/ldns-verify-zone: examples/ldns-verify-zone.lo examples/ldns-verify-zone.o $(LIB)
55+
-examples/ldns-testns: examples/ldns-testns.lo examples/ldns-testns.o examples/ldns-testpkts.lo examples/ldns-testpkts.o $(LIB)
56+
+examples/ldns-chaos: examples/ldns-chaos.lo $(LIB)
57+
+examples/ldns-compare-zones: examples/ldns-compare-zones.lo $(LIB)
58+
+examples/ldnsd: examples/ldnsd.lo $(LIB)
59+
+examples/ldns-gen-zone: examples/ldns-gen-zone.lo $(LIB)
60+
+examples/ldns-key2ds: examples/ldns-key2ds.lo $(LIB)
61+
+examples/ldns-keyfetcher: examples/ldns-keyfetcher.lo $(LIB)
62+
+examples/ldns-keygen: examples/ldns-keygen.lo $(LIB)
63+
+examples/ldns-mx: examples/ldns-mx.lo $(LIB)
64+
+examples/ldns-notify: examples/ldns-notify.lo $(LIB)
65+
+examples/ldns-read-zone: examples/ldns-read-zone.lo $(LIB)
66+
+examples/ldns-resolver: examples/ldns-resolver.lo $(LIB)
67+
+examples/ldns-rrsig: examples/ldns-rrsig.lo $(LIB)
68+
+examples/ldns-test-edns: examples/ldns-test-edns.lo $(LIB)
69+
+examples/ldns-update: examples/ldns-update.lo $(LIB)
70+
+examples/ldns-version: examples/ldns-version.lo $(LIB)
71+
+examples/ldns-walk: examples/ldns-walk.lo $(LIB)
72+
+examples/ldns-zcat: examples/ldns-zcat.lo $(LIB)
73+
+examples/ldns-zsplit: examples/ldns-zsplit.lo $(LIB)
74+
+examples/ldns-dpa: examples/ldns-dpa.lo $(LIB)
75+
+examples/ldns-dane: examples/ldns-dane.lo $(LIB)
76+
+examples/ldns-nsec3-hash: examples/ldns-nsec3-hash.lo $(LIB)
77+
+examples/ldns-revoke: examples/ldns-revoke.lo $(LIB)
78+
+examples/ldns-signzone: examples/ldns-signzone.lo $(LIB)
79+
+examples/ldns-verify-zone: examples/ldns-verify-zone.lo $(LIB)
80+
+examples/ldns-testns: examples/ldns-testns.lo examples/ldns-testpkts.lo $(LIB)
81+
--
82+
2.45.3
83+

‎SPECS/ldns/ldns.spec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
Summary: Low-level DNS(SEC) library with API
3232
Name: ldns
3333
Version: 1.8.3
34-
Release: 1%{?dist}
34+
Release: 2%{?dist}
3535
License: BSD-3-Clause
3636
Vendor: Microsoft Corporation
3737
Distribution: Azure Linux
@@ -40,6 +40,7 @@ Url: http://www.nlnetlabs.nl/%{name}/
4040
Source0: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
4141

4242
Patch1: ldns-swig-4.2.patch
43+
Patch2: fix-intermittent-build-failure-with-milti-job-build.patch
4344

4445
BuildRequires: autoconf
4546
BuildRequires: automake
@@ -169,7 +170,7 @@ export CFLAGS CXXFLAGS LDFLAGS
169170
pushd %{pkgname}_python3
170171
%else
171172
pushd %{pkgname}
172-
%endif # with python3
173+
%endif
173174

174175
%configure \
175176
--disable-rpath \
@@ -278,6 +279,10 @@ rm -rf doc/man
278279
%doc doc
279280

280281
%changelog
282+
* Tue Feb 25 2025 Tobias Brick <tobiasb@microsoft.com> - 1.8.3-2
283+
- Patch to fix multi-job builds.
284+
- Also removed comment that caused rpmbuild warning.
285+
281286
* Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.8.3-1
282287
- Auto-upgrade to 1.8.3 - Upgrade for Azure Linux 3.0
283288
- Removed unsupported multilib patch (azl only supports 64bit)

0 commit comments

Comments
 (0)