diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-17 20:37:23 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-17 23:13:59 +0100 |
| commit | 93bc890cb9f8fd0c8052c40540b514c5b2c06040 (patch) | |
| tree | 9643e4db4024b6d39f613d27fbc6adda9158fe16 | |
| parent | 012c5c1de3465b6b82814b5b3c9273ea6f537916 (diff) | |
| download | poky-93bc890cb9f8fd0c8052c40540b514c5b2c06040.tar.gz | |
serf: Add new recipe (needed by subversion for http support)
(From OE-Core rev: 572407ad9474f94299810c5c9a81587265730218)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/serf/serf/norpath.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-support/serf/serf_1.3.6.bb | 27 |
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 @@ | |||
| 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.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 | |||
| 2 | SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2 \ | ||
| 3 | file://norpath.patch" | ||
| 4 | SRC_URI[md5sum] = "7fe38fa6eab078e0beabf291d8e4995d" | ||
| 5 | SRC_URI[sha256sum] = "ca637beb0399797d4fc7ffa85e801733cd9c876997fac4a4fd12e9afe86563f2" | ||
| 6 | |||
| 7 | LICENSE = "Apache-2.0" | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | ||
| 9 | |||
| 10 | DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" | ||
| 11 | |||
| 12 | FULLCC = "${STAGING_BINDIR_TOOLCHAIN}/${CC}" | ||
| 13 | FULLCC_class-native = "${CC}" | ||
| 14 | |||
| 15 | do_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 | |||
| 23 | do_install() { | ||
| 24 | ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} install | ||
| 25 | } | ||
| 26 | |||
| 27 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
