diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/serf/serf/norpath.patch | 18 |
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 | ||
6 | RP 2014/7/17 | 6 | RP 2014/7/17 |
7 | 7 | ||
8 | Index: serf-1.3.6/SConstruct | 8 | Index: 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) |