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:56 +0100 |
| commit | 572407ad9474f94299810c5c9a81587265730218 (patch) | |
| tree | 066f53941b0e203990185ca68d8aa75d37cf2187 /meta | |
| parent | ebe518d6bb8af6b53805e554e4a61e6534cfb479 (diff) | |
| download | openembedded-core-572407ad9474f94299810c5c9a81587265730218.tar.gz openembedded-core-572407ad9474f94299810c5c9a81587265730218.tar.bz2 openembedded-core-572407ad9474f94299810c5c9a81587265730218.zip | |
serf: Add new recipe (needed by subversion for http support)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 @@ +The RPATH handling in serf is all wrong for us and we don't need it +anyway so hack around it by removing this for now. + +Upstream-Status: Inappropriate + +RP 2014/7/17 + +Index: serf-1.3.6/SConstruct +=================================================================== +--- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 ++++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 +@@ -218,8 +218,7 @@ + else: + LIBNAMESTATIC = 'serf-${MAJOR}' + +-env.Append(RPATH=libdir, +- PDB='${TARGET.filebase}.pdb') ++env.Append(PDB='${TARGET.filebase}.pdb') + + #for i in env: + # print(str(env[i])) +@@ -371,12 +370,6 @@ + if sys.platform == 'win32': + env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) + +-# On some systems, the -R values that APR describes never make it into actual +-# RPATH flags. We'll manually map all directories in LIBPATH into new +-# flags to set RPATH values. +-for d in env['LIBPATH']: +- env.Append(RPATH=':'+d) +- + # Set up the construction of serf-*.pc + pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), + env.File('build/serf.pc.in'), +@@ -446,7 +439,6 @@ + ENV={'PATH' : os.environ['PATH']})) + + # Find the (dynamic) library in this directory +-tenv.Replace(RPATH=thisdir) + tenv.Prepend(LIBS=[LIBNAMESTATIC, ], + LIBPATH=[thisdir, ]) + 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 @@ + +SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2 \ + file://norpath.patch" +SRC_URI[md5sum] = "7fe38fa6eab078e0beabf291d8e4995d" +SRC_URI[sha256sum] = "ca637beb0399797d4fc7ffa85e801733cd9c876997fac4a4fd12e9afe86563f2" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" + +FULLCC = "${STAGING_BINDIR_TOOLCHAIN}/${CC}" +FULLCC_class-native = "${CC}" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ + CC="${FULLCC}" \ + APR=`which apr-1-config` APU=`which apu-1-config` \ + CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ + OPENSSL="${STAGING_EXECPREFIXDIR}" +} + +do_install() { + ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} install +} + +BBCLASSEXTEND = "native"
\ No newline at end of file |