diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-12-27 16:06:21 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-12-27 16:06:21 +0000 |
| commit | 969b90880762541f0a33f355b6426cdb1c1037b0 (patch) | |
| tree | 39e32856a84ad308fc7d831ba5c82035ac0c1047 /packages/apr | |
| parent | a0adf67b586d4dc5364f88a20d80a8b126d8e689 (diff) | |
| parent | 4acfd704d0eb15143f1487ef728e6900dcdc460d (diff) | |
merge of 'a4569078ab220c88694fa953c1dacc27d4b9300e'
and 'fc6211a28427a6d82895be30299c901ec3e85868'
Diffstat (limited to 'packages/apr')
| -rw-r--r-- | packages/apr/apr-util_1.2.7.bb | 9 | ||||
| -rw-r--r-- | packages/apr/apr_1.2.7.bb | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index ea81607953..904e41f8a3 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -14,12 +14,19 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \ --without-sqlite3 \ --with-expat=${STAGING_DIR_HOST}${layout_prefix}" + inherit autotools lib_package binconfig +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + do_configure() { + cp ${STAGING_DATADIR}/apr_rules.mk ${S}/build/rules.mk oe_runconf } do_stage() { - autotools_stage_all + autotools_stage_all + sed -i s,/usr/lib/libgdbm.la,-lgdbm,g ${STAGING_LIBDIR}/libaprutil-1.la + sed -i s,/usr/lib/libexpat.la,-lexpat,g ${STAGING_LIBDIR}/libaprutil-1.la + sed -i s,/usr/lib/libapr-1.la,-lapr-1,g ${STAGING_LIBDIR}/libaprutil-1.la } diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb index 2016ca0126..d0f2916bfa 100644 --- a/packages/apr/apr_1.2.7.bb +++ b/packages/apr/apr_1.2.7.bb @@ -9,10 +9,13 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" inherit autotools lib_package binconfig +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + do_configure() { oe_runconf } do_stage() { autotools_stage_all + cp ${S}/build/apr_rules.mk ${STAGING_DATADIR} } |