summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt/makerace.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit98e78f2e49bf3a77281fd581b0f1a5803615ef94 (patch)
treeabfa1d540e0d12be388c65ded23a4758ccad7389 /meta/recipes-devtools/apt/apt/makerace.patch
parente49ac3eabba388444f83f96f068ed7c95f8a80be (diff)
downloadpoky-98e78f2e49bf3a77281fd581b0f1a5803615ef94.tar.gz
apt: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: a70103a6e400caaa87e1d36a7e59be7f3059a3bb) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/makerace.patch')
-rw-r--r--meta/recipes-devtools/apt/apt/makerace.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/apt/apt/makerace.patch b/meta/recipes-devtools/apt/apt/makerace.patch
index 46e3161b67..0c686d6e27 100644
--- a/meta/recipes-devtools/apt/apt/makerace.patch
+++ b/meta/recipes-devtools/apt/apt/makerace.patch
@@ -8,16 +8,16 @@ RP 2012/3/19
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Index: apt-0.9.9.4/buildlib/library.mak 11Index: apt-1.2.24/buildlib/library.mak
12=================================================================== 12===================================================================
13--- apt-0.9.9.4.orig/buildlib/library.mak 2013-07-31 15:45:07.320440575 +0300 13--- apt-1.2.24.orig/buildlib/library.mak
14+++ apt-0.9.9.4/buildlib/library.mak 2013-07-31 15:46:49.440440561 +0300 14+++ apt-1.2.24/buildlib/library.mak
15@@ -61,7 +61,7 @@ 15@@ -65,7 +65,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR
16 16
17 # Compilation rules 17 # Compilation rules
18 vpath %.cc $(SUBDIRS) 18 vpath %.cc $(SUBDIRS)
19-$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) 19-$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
20+$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS) 20+$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS)
21 echo Compiling $< to $@ 21 echo Compiling $< to $@
22 $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< 22 $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)'
23 $(DoDep) 23 $(DoDep)