aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/serf/serf/norpath.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 20:37:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 23:13:56 +0100
commit572407ad9474f94299810c5c9a81587265730218 (patch)
tree066f53941b0e203990185ca68d8aa75d37cf2187 /meta/recipes-support/serf/serf/norpath.patch
parentebe518d6bb8af6b53805e554e4a61e6534cfb479 (diff)
downloadopenembedded-core-572407ad9474f94299810c5c9a81587265730218.tar.gz
openembedded-core-572407ad9474f94299810c5c9a81587265730218.tar.bz2
openembedded-core-572407ad9474f94299810c5c9a81587265730218.zip
serf: Add new recipe (needed by subversion for http support)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/serf/serf/norpath.patch')
-rw-r--r--meta/recipes-support/serf/serf/norpath.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-support/serf/serf/norpath.patch b/meta/recipes-support/serf/serf/norpath.patch
new file mode 100644
index 0000000000..380f5d00d2
--- /dev/null
+++ b/meta/recipes-support/serf/serf/norpath.patch
@@ -0,0 +1,42 @@
+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, ])
+