summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/serf/serf/env.patch28
-rw-r--r--meta/recipes-support/serf/serf_1.3.8.bb9
2 files changed, 31 insertions, 6 deletions
diff --git a/meta/recipes-support/serf/serf/env.patch b/meta/recipes-support/serf/serf/env.patch
new file mode 100644
index 0000000000..9d073e9abf
--- /dev/null
+++ b/meta/recipes-support/serf/serf/env.patch
@@ -0,0 +1,28 @@
1'scons' cleans the environment which breaks ccache builds because
2CCACHEDIR can point to an unexpected location:
3
4| ccache arm-linux-gnueabi-gcc ... context.c
5| ccache: failed to create .../serf/1.3.6-r0/.home/.ccache (No such file or directory)
6
7Issue is described in
8
9 http://www.scons.org/wiki/ImportingEnvironmentSettings
10
11and because 'bitbake' cleans environment we can pass it completely
12instead of trying to enumerate needed env.
13
14Upstream-Status: Inappropriate
15
16
17Index: serf-1.3.6/SConstruct
18===================================================================
19--- serf-1.3.6.orig/SConstruct
20+++ serf-1.3.6/SConstruct
21@@ -149,6 +149,7 @@ if sys.platform == 'win32':
22 env = Environment(variables=opts,
23 tools=('default', 'textfile',),
24 CPPPATH=['.', ],
25+ ENV = os.environ,
26 )
27
28 env.Append(BUILDERS = {
diff --git a/meta/recipes-support/serf/serf_1.3.8.bb b/meta/recipes-support/serf/serf_1.3.8.bb
index 10db122da9..e8188895b3 100644
--- a/meta/recipes-support/serf/serf_1.3.8.bb
+++ b/meta/recipes-support/serf/serf_1.3.8.bb
@@ -1,7 +1,7 @@
1 1
2SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-${PV}.tar.bz2 \ 2SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-${PV}.tar.bz2 \
3 file://norpath.patch" 3 file://norpath.patch \
4SRC_URI[md5sum] = "2e4efe57ff28cb3202a112e90f0c2889" 4 file://env.patch"
5SRC_URI[sha256sum] = "e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590" 5SRC_URI[sha256sum] = "e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590"
6 6
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
@@ -9,12 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
9 9
10DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" 10DEPENDS = "python-scons-native openssl apr apr-util util-linux expat"
11 11
12FULLCC = "${STAGING_BINDIR_TOOLCHAIN}/${CC}"
13FULLCC_class-native = "${CC}"
14
15do_compile() { 12do_compile() {
16 ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ 13 ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \
17 CC="${FULLCC}" \ 14 CC="${CC}" \
18 APR=`which apr-1-config` APU=`which apu-1-config` \ 15 APR=`which apr-1-config` APU=`which apu-1-config` \
19 CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ 16 CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \
20 OPENSSL="${STAGING_EXECPREFIXDIR}" 17 OPENSSL="${STAGING_EXECPREFIXDIR}"