summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commit00cb0ff014bc38abd971a475af4aa7787a058d53 (patch)
tree6b5192371a78f696ff0697b419fd03205e3b1053 /meta/recipes-support
parent1059e1703663a324a1db72021c33354c04e860e5 (diff)
downloadpoky-00cb0ff014bc38abd971a475af4aa7787a058d53.tar.gz
serf: 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: e88a184fbefa69233e0cc86134808bce7b06d6cf) 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-support')
-rw-r--r--meta/recipes-support/serf/serf/norpath.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-support/serf/serf/norpath.patch b/meta/recipes-support/serf/serf/norpath.patch
index 380f5d00d2..c392444f7b 100644
--- a/meta/recipes-support/serf/serf/norpath.patch
+++ b/meta/recipes-support/serf/serf/norpath.patch
@@ -5,11 +5,11 @@ Upstream-Status: Inappropriate
5 5
6RP 2014/7/17 6RP 2014/7/17
7 7
8Index: serf-1.3.6/SConstruct 8Index: serf-1.3.9/SConstruct
9=================================================================== 9===================================================================
10--- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 10--- serf-1.3.9.orig/SConstruct
11+++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 11+++ serf-1.3.9/SConstruct
12@@ -218,8 +218,7 @@ 12@@ -224,8 +224,7 @@ if sys.platform != 'win32':
13 else: 13 else:
14 LIBNAMESTATIC = 'serf-${MAJOR}' 14 LIBNAMESTATIC = 'serf-${MAJOR}'
15 15
@@ -17,9 +17,9 @@ Index: serf-1.3.6/SConstruct
17- PDB='${TARGET.filebase}.pdb') 17- PDB='${TARGET.filebase}.pdb')
18+env.Append(PDB='${TARGET.filebase}.pdb') 18+env.Append(PDB='${TARGET.filebase}.pdb')
19 19
20 #for i in env: 20 if sys.platform == 'darwin':
21 # print(str(env[i])) 21 # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
22@@ -371,12 +370,6 @@ 22@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY:
23 if sys.platform == 'win32': 23 if sys.platform == 'win32':
24 env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) 24 env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
25 25
@@ -32,8 +32,8 @@ Index: serf-1.3.6/SConstruct
32 # Set up the construction of serf-*.pc 32 # Set up the construction of serf-*.pc
33 pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), 33 pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
34 env.File('build/serf.pc.in'), 34 env.File('build/serf.pc.in'),
35@@ -446,7 +439,6 @@ 35@@ -461,7 +454,6 @@ else:
36 ENV={'PATH' : os.environ['PATH']})) 36 TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ]
37 37
38 # Find the (dynamic) library in this directory 38 # Find the (dynamic) library in this directory
39-tenv.Replace(RPATH=thisdir) 39-tenv.Replace(RPATH=thisdir)