diff options
-rw-r--r-- | meta/recipes-support/serf/serf/env.patch | 28 | ||||
-rw-r--r-- | meta/recipes-support/serf/serf_1.3.7.bb | 8 |
2 files changed, 31 insertions, 5 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 | ||
2 | CCACHEDIR 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 | |||
7 | Issue is described in | ||
8 | |||
9 | http://www.scons.org/wiki/ImportingEnvironmentSettings | ||
10 | |||
11 | and because 'bitbake' cleans environment we can pass it completely | ||
12 | instead of trying to enumerate needed env. | ||
13 | |||
14 | Upstream-Status: Inappropriate | ||
15 | |||
16 | |||
17 | Index: 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.7.bb b/meta/recipes-support/serf/serf_1.3.7.bb index 5230ef7387..b87a04ab69 100644 --- a/meta/recipes-support/serf/serf_1.3.7.bb +++ b/meta/recipes-support/serf/serf_1.3.7.bb | |||
@@ -1,6 +1,7 @@ | |||
1 | 1 | ||
2 | SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.7.tar.bz2 \ | 2 | SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.7.tar.bz2 \ |
3 | file://norpath.patch" | 3 | file://norpath.patch \ |
4 | file://env.patch" | ||
4 | SRC_URI[md5sum] = "0a6fa745df4517dd8f79c75c538919bc" | 5 | SRC_URI[md5sum] = "0a6fa745df4517dd8f79c75c538919bc" |
5 | SRC_URI[sha256sum] = "ecccb74e665e6ea7539271e126a21d0f7eeddfeaa8ce090adb3aec6682f9f0ae" | 6 | SRC_URI[sha256sum] = "ecccb74e665e6ea7539271e126a21d0f7eeddfeaa8ce090adb3aec6682f9f0ae" |
6 | 7 | ||
@@ -9,12 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | |||
9 | 10 | ||
10 | DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" | 11 | DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" |
11 | 12 | ||
12 | FULLCC = "${STAGING_BINDIR_TOOLCHAIN}/${CC}" | ||
13 | FULLCC_class-native = "${CC}" | ||
14 | |||
15 | do_compile() { | 13 | do_compile() { |
16 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ | 14 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ |
17 | CC="${FULLCC}" \ | 15 | CC="${CC}" \ |
18 | APR=`which apr-1-config` APU=`which apu-1-config` \ | 16 | APR=`which apr-1-config` APU=`which apu-1-config` \ |
19 | CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ | 17 | CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ |
20 | OPENSSL="${STAGING_EXECPREFIXDIR}" | 18 | OPENSSL="${STAGING_EXECPREFIXDIR}" |