mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-21 05:27:01 +00:00
Code Issues Projects Releases Wiki Activity

apt: Fix parallel make race

Browse Source 
I was just going to turn off parallel make but ended up fixing this properly.

(From OE-Core rev: dcad44962fc78741020584edced0526866d09b53)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2012-03-19 15:55:20 +00:00
parent 46b7131052
commit 78f91f09e7
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
+23
View File
@@ -0,0 +1,23 @@
I was seeing various issues with parallel make, mainly due to to what was likely
partially installed headers. If you change into the source directory and
"NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it
doesn't have any dependencies on the headers being installed. This patch
fixes that so things build correctly.
RP 2012/3/19
Upstream-Status: Pending
Index: apt-0.7.14/buildlib/library.mak
===================================================================
--- apt-0.7.14.orig/buildlib/library.mak
+++ apt-0.7.14/buildlib/library.mak
@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR
# Compilation rules
vpath %.cc $(SUBDIRS)
-$(OBJ)/%.opic: %.cc
+$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS)
echo Compiling $< to $@
$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
$(DoDep)