diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 15:55:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 20:22:23 +0000 |
| commit | dcad44962fc78741020584edced0526866d09b53 (patch) | |
| tree | d099deb8db562fd5091effd469c9d00faf9c1fd1 /meta/recipes-devtools/apt | |
| parent | 4667f571e334b95716c3247e59742733c48de644 (diff) | |
| download | openembedded-core-dcad44962fc78741020584edced0526866d09b53.tar.gz openembedded-core-dcad44962fc78741020584edced0526866d09b53.tar.bz2 openembedded-core-dcad44962fc78741020584edced0526866d09b53.tar.xz openembedded-core-dcad44962fc78741020584edced0526866d09b53.zip | |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt')
| -rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/makerace.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt-native_0.7.14.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt_0.7.14.bb | 2 |
4 files changed, 26 insertions, 2 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 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) diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb index 37368acbc..ec3fd20a8 100644 --- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb @@ -1,6 +1,6 @@ require apt-native.inc -PR = "r6" +PR = "r7" SRC_URI += "file://nodoc.patch \ file://noconfigure.patch \ diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 6265203bc..9d32ddb4c 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -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 diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb index bd1116f3d..8464b7f90 100644 --- a/meta/recipes-devtools/apt/apt_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt_0.7.14.bb @@ -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 " |