summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 15:55:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 20:28:46 +0000
commit78f91f09e726b89a8f5612779f8a3900ea16bb36 (patch)
treeaaf9649a798a5f3e26f521dfe9df2c6e8a3e60c8 /meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
parent46b713105223063e0ed17b096d2efb8efe9e37ab (diff)
downloadpoky-78f91f09e726b89a8f5612779f8a3900ea16bb36.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.7.14/makerace.patch')
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/makerace.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch b/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
new file mode 100644
index 0000000000..403711f013
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
@@ -0,0 +1,23 @@
1I was seeing various issues with parallel make, mainly due to to what was likely
2partially installed headers. If you change into the source directory and
3"NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it
4doesn't have any dependencies on the headers being installed. This patch
5fixes that so things build correctly.
6
7RP 2012/3/19
8
9Upstream-Status: Pending
10
11Index: apt-0.7.14/buildlib/library.mak
12===================================================================
13--- apt-0.7.14.orig/buildlib/library.mak
14+++ apt-0.7.14/buildlib/library.mak
15@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR
16
17 # Compilation rules
18 vpath %.cc $(SUBDIRS)
19-$(OBJ)/%.opic: %.cc
20+$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS)
21 echo Compiling $< to $@
22 $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
23 $(DoDep)