| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | I was seeing various issues with parallel make, mainly due to to what was likely |
| 2 | partially installed headers. If you change into the source directory and |
| 3 | "NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it |
| 4 | doesn't have any dependencies on the headers being installed. This patch |
| 5 | fixes that so things build correctly. |
| 6 | |
| 7 | RP 2012/3/19 |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 11 | Index: apt-1.2.24/buildlib/library.mak |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 12 | =================================================================== |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 13 | --- apt-1.2.24.orig/buildlib/library.mak |
| 14 | +++ apt-1.2.24/buildlib/library.mak |
| 15 | @@ -65,7 +65,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 16 | |
| 17 | # Compilation rules |
| 18 | vpath %.cc $(SUBDIRS) |
| 19 | -$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) |
| 20 | +$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS) |
| 21 | echo Compiling $< to $@ |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 22 | $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)' |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 23 | $(DoDep) |