apt: Fix parallel make race
I was just going to turn off parallel make but ended up fixing this properly. (From OE-Core rev: 440a6d5aacf7807536feee5d09484712ba34ca80) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
08d70734d5
commit
af3e5039e8
|
@ -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)
|
|
@ -1,6 +1,6 @@
|
|||
require apt-native.inc
|
||||
|
||||
PR = "r6"
|
||||
PR = "r7"
|
||||
|
||||
SRC_URI += "file://nodoc.patch \
|
||||
file://noconfigure.patch \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 "
|
||||
|
|
Loading…
Reference in New Issue