2 files changed, 0 insertions, 70 deletions
diff --git a/yocto-poky/meta/recipes-support/serf/serf/env.patch b/yocto-poky/meta/recipes-support/serf/serf/env.patch
deleted file mode 100644
index 9d073e9ab..000000000
--- a/yocto-poky/meta/recipes-support/serf/serf/env.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-'scons' cleans the environment which breaks ccache builds because
-CCACHEDIR can point to an unexpected location:
-
-| ccache arm-linux-gnueabi-gcc ... context.c
-| ccache: failed to create .../serf/1.3.6-r0/.home/.ccache (No such file or directory)
-
-Issue is described in
-
-  http://www.scons.org/wiki/ImportingEnvironmentSettings
-
-and because 'bitbake' cleans environment we can pass it completely
-instead of trying to enumerate needed env.
-
-Upstream-Status: Inappropriate
-
-
-Index: serf-1.3.6/SConstruct
-===================================================================
---- serf-1.3.6.orig/SConstruct
-+++ serf-1.3.6/SConstruct
-@@ -149,6 +149,7 @@ if sys.platform == 'win32':
- env = Environment(variables=opts,
-                   tools=('default', 'textfile',),
-                   CPPPATH=['.', ],
-+                  ENV = os.environ,
-                   )
-
- env.Append(BUILDERS = {
diff --git a/yocto-poky/meta/recipes-support/serf/serf/norpath.patch b/yocto-poky/meta/recipes-support/serf/serf/norpath.patch
deleted file mode 100644
index 380f5d00d..000000000
--- a/yocto-poky/meta/recipes-support/serf/serf/norpath.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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.6/SConstruct
-===================================================================
---- serf-1.3.6.orig/SConstruct	2014-07-17 19:57:57.724389150 +0000
-+++ serf-1.3.6/SConstruct	2014-07-17 20:04:21.784399616 +0000
-@@ -218,8 +218,7 @@
- else:
-   LIBNAMESTATIC = 'serf-${MAJOR}'
- 
--env.Append(RPATH=libdir,
--           PDB='${TARGET.filebase}.pdb')
-+env.Append(PDB='${TARGET.filebase}.pdb')
- 
- #for i in env:
- #    print(str(env[i]))
-@@ -371,12 +370,6 @@
- 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'),
-@@ -446,7 +439,6 @@
-                           ENV={'PATH' : os.environ['PATH']}))
- 
- # Find the (dynamic) library in this directory
--tenv.Replace(RPATH=thisdir)
- tenv.Prepend(LIBS=[LIBNAMESTATIC, ],
-              LIBPATH=[thisdir, ])
-