diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/serf | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-support/serf')
-rw-r--r-- | meta/recipes-support/serf/serf/env.patch | 28 | ||||
-rw-r--r-- | meta/recipes-support/serf/serf/norpath.patch | 42 | ||||
-rw-r--r-- | meta/recipes-support/serf/serf_1.3.7.bb | 25 |
3 files changed, 95 insertions, 0 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/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 @@ | |||
1 | The RPATH handling in serf is all wrong for us and we don't need it | ||
2 | anyway so hack around it by removing this for now. | ||
3 | |||
4 | Upstream-Status: Inappropriate | ||
5 | |||
6 | RP 2014/7/17 | ||
7 | |||
8 | Index: 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.7.bb b/meta/recipes-support/serf/serf_1.3.7.bb new file mode 100644 index 0000000000..b87a04ab69 --- /dev/null +++ b/meta/recipes-support/serf/serf_1.3.7.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | |||
2 | SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.7.tar.bz2 \ | ||
3 | file://norpath.patch \ | ||
4 | file://env.patch" | ||
5 | SRC_URI[md5sum] = "0a6fa745df4517dd8f79c75c538919bc" | ||
6 | SRC_URI[sha256sum] = "ecccb74e665e6ea7539271e126a21d0f7eeddfeaa8ce090adb3aec6682f9f0ae" | ||
7 | |||
8 | LICENSE = "Apache-2.0" | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | ||
10 | |||
11 | DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" | ||
12 | |||
13 | do_compile() { | ||
14 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ | ||
15 | CC="${CC}" \ | ||
16 | APR=`which apr-1-config` APU=`which apu-1-config` \ | ||
17 | CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ | ||
18 | OPENSSL="${STAGING_EXECPREFIXDIR}" | ||
19 | } | ||
20 | |||
21 | do_install() { | ||
22 | ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} LIBDIR=${D}${libdir} install | ||
23 | } | ||
24 | |||
25 | BBCLASSEXTEND = "native" | ||