diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 15:55:20 +0000 |
|---|---|---|
| committer |   Joshua Lock <josh@linux.intel.com> | 2012-06-19 11:35:01 -0700 |
| commit | 440a6d5aacf7807536feee5d09484712ba34ca80 (patch) | |
| tree | d493b76a73c891209b74a08618a82b669481b85c /meta/recipes-devtools/apt/apt-0.7.14/makerace.patch | |
| parent | 4bcffbcd05c86903fbdf47bb46bf1a52b888dfeb (diff) | |
| download | openembedded-core-440a6d5aacf7807536feee5d09484712ba34ca80.tar.gz | |
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>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
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.patch | 23 |
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 @@ +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) |