summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/serf/serf/norpath.patch42
-rw-r--r--meta/recipes-support/serf/serf_1.3.6.bb27
2 files changed, 69 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 @@
1The RPATH handling in serf is all wrong for us and we don't need it
2anyway so hack around it by removing this for now.
3
4Upstream-Status: Inappropriate
5
6RP 2014/7/17
7
8Index: serf-1.3.6/SConstruct
9===================================================================
10--- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000
11+++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000
12@@ -218,8 +218,7 @@
13 else:
14 LIBNAMESTATIC = 'serf-${MAJOR}'
15
16-env.Append(RPATH=libdir,
17- PDB='${TARGET.filebase}.pdb')
18+env.Append(PDB='${TARGET.filebase}.pdb')
19
20 #for i in env:
21 # print(str(env[i]))
22@@ -371,12 +370,6 @@
23 if sys.platform == 'win32':
24 env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
25
26-# On some systems, the -R values that APR describes never make it into actual
27-# RPATH flags. We'll manually map all directories in LIBPATH into new
28-# flags to set RPATH values.
29-for d in env['LIBPATH']:
30- env.Append(RPATH=':'+d)
31-
32 # Set up the construction of serf-*.pc
33 pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
34 env.File('build/serf.pc.in'),
35@@ -446,7 +439,6 @@
36 ENV={'PATH' : os.environ['PATH']}))
37
38 # Find the (dynamic) library in this directory
39-tenv.Replace(RPATH=thisdir)
40 tenv.Prepend(LIBS=[LIBNAMESTATIC, ],
41 LIBPATH=[thisdir, ])
42
diff --git a/meta/recipes-support/serf/serf_1.3.6.bb b/meta/recipes-support/serf/serf_1.3.6.bb
new file mode 100644
index 0000000000..9893cb7212
--- /dev/null
+++ b/meta/recipes-support/serf/serf_1.3.6.bb
@@ -0,0 +1,27 @@
1
2SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2 \
3 file://norpath.patch"
4SRC_URI[md5sum] = "7fe38fa6eab078e0beabf291d8e4995d"
5SRC_URI[sha256sum] = "ca637beb0399797d4fc7ffa85e801733cd9c876997fac4a4fd12e9afe86563f2"
6
7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
9
10DEPENDS = "python-scons-native openssl apr apr-util util-linux expat"
11
12FULLCC = "${STAGING_BINDIR_TOOLCHAIN}/${CC}"
13FULLCC_class-native = "${CC}"
14
15do_compile() {
16 ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \
17 CC="${FULLCC}" \
18 APR=`which apr-1-config` APU=`which apu-1-config` \
19 CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \
20 OPENSSL="${STAGING_EXECPREFIXDIR}"
21}
22
23do_install() {
24 ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} install
25}
26
27BBCLASSEXTEND = "native" \ No newline at end of file