diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 13:56:55 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 13:56:55 +0000 |
| commit | e9a1c2f913993892e4b6a8236af9ea41bc281676 (patch) | |
| tree | b888625a6ed1a5c97b5563e04df6b4892f97d7e8 | |
| parent | 559aa188d1c0d4fe6516f223256142d143546ae3 (diff) | |
| download | openembedded-core-e9a1c2f913993892e4b6a8236af9ea41bc281676.tar.gz openembedded-core-e9a1c2f913993892e4b6a8236af9ea41bc281676.tar.bz2 openembedded-core-e9a1c2f913993892e4b6a8236af9ea41bc281676.tar.xz openembedded-core-e9a1c2f913993892e4b6a8236af9ea41bc281676.zip | |
apr: Convert staging mangling to a sysroot_preprocess function
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/apr/apr_1.3.3.bb | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/meta/packages/apr/apr_1.3.3.bb b/meta/packages/apr/apr_1.3.3.bb index 0d0fd667c..a193a18a2 100644 --- a/meta/packages/apr/apr_1.3.3.bb +++ b/meta/packages/apr/apr_1.3.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library" SECTION = "libs" LICENSE = "Apache License, Version 2.0" -PR = "r4" +PR = "r5" SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \ file://configure_fixes.patch;patch=1 \ @@ -18,15 +18,17 @@ do_configure_prepend() { ./buildconf } -do_stage() { - autotools_stage_all - install -d ${STAGING_DATADIR}/apr - cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/ - sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk - sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk - sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk - sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk - cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/ - cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/ - cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/ +SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" + +apr_sysroot_preprocess () { + d=${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/apr + install -d $d/ + cp ${S}/build/apr_rules.mk $d/ + sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk + sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk + sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g $d/apr_rules.mk + sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk + cp ${S}/build/mkdir.sh $d/ + cp ${S}/build/make_exports.awk $d/ + cp ${S}/build/make_var_export.awk $d/ } |