mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 21:52:39 +02:00
00cb0ff014
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>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
The RPATH handling in serf is all wrong for us and we don't need it
|
|
anyway so hack around it by removing this for now.
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
RP 2014/7/17
|
|
|
|
Index: serf-1.3.9/SConstruct
|
|
===================================================================
|
|
--- serf-1.3.9.orig/SConstruct
|
|
+++ serf-1.3.9/SConstruct
|
|
@@ -224,8 +224,7 @@ if sys.platform != 'win32':
|
|
else:
|
|
LIBNAMESTATIC = 'serf-${MAJOR}'
|
|
|
|
-env.Append(RPATH=libdir,
|
|
- PDB='${TARGET.filebase}.pdb')
|
|
+env.Append(PDB='${TARGET.filebase}.pdb')
|
|
|
|
if sys.platform == 'darwin':
|
|
# linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
|
|
@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY:
|
|
if sys.platform == 'win32':
|
|
env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
|
|
|
|
-# On some systems, the -R values that APR describes never make it into actual
|
|
-# RPATH flags. We'll manually map all directories in LIBPATH into new
|
|
-# flags to set RPATH values.
|
|
-for d in env['LIBPATH']:
|
|
- env.Append(RPATH=':'+d)
|
|
-
|
|
# Set up the construction of serf-*.pc
|
|
pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
|
|
env.File('build/serf.pc.in'),
|
|
@@ -461,7 +454,6 @@ else:
|
|
TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ]
|
|
|
|
# Find the (dynamic) library in this directory
|
|
-tenv.Replace(RPATH=thisdir)
|
|
tenv.Prepend(LIBS=[LIBNAMESTATIC, ],
|
|
LIBPATH=[thisdir, ])
|
|
|