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 <[email protected]>
---
meta/recipes-devtools/apt/apt-0.7.14/makerace.patch renamed from dev/null +23 -0
@@ -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)
meta/recipes-devtools/apt/apt-native_0.7.14.bb +1 -1
@@ -1,6 +1,6 @@ require apt-native.inc -PR = "r6" +PR = "r7" SRC_URI += "file://nodoc.patch \ file://noconfigure.patch \
meta/recipes-devtools/apt/apt.inc +1 -0
@@ -6,6 +6,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ file://no-ko-translation.patch \ file://use-host.patch \ file://localefixes.patch \ + file://makerace.patch \ " inherit autotools gettext
meta/recipes-devtools/apt/apt_0.7.14.bb +1 -1
@@ -3,7 +3,7 @@ RDEPENDS_${PN} = "dpkg" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.inc -PR = "r9" +PR = "r10" SRC_URI += "file://nodoc.patch \ file://includes-fix.patch "
Quoted 3 lines · Richard Purdie
I was just going to turn off parallel make but ended up fixing this properly.
Signed-off-by Richard Purdie <[email protected]>
Thanks for fixing the underlying problem. I would like to encourage that we try this all the time I know many times it may not be possible for us to fix a given package but then we should report it upstream as a plan b
before we add PARALLE_MAKE = "" to packages