From dcad44962fc78741020584edced0526866d09b53 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 19 Mar 2012 15:55:20 +0000 Subject: apt: Fix parallel make race I was just going to turn off parallel make but ended up fixing this properly. Signed-off-by: Richard Purdie --- .../recipes-devtools/apt/apt-0.7.14/makerace.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt-0.7.14/makerace.patch (limited to 'meta/recipes-devtools/apt/apt-0.7.14') 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 000000000..403711f01 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch @@ -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) -- cgit v1.2.3