generic-poky/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
Richard Purdie 78f91f09e7 apt: Fix parallel make race
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>
2012-03-19 20:28:46 +00:00

24 lines
843 B
Diff

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)