diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2011-03-09 16:46:36 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2011-03-09 16:46:36 -0700 |
| commit | 5d121d88280f78ca3bc5902d46d8ed058193d28e (patch) | |
| tree | faadbc8dcdd05fb04dec808ccaa407d4471903aa /recipes/apr | |
| parent | 61e9a8f059321e2352a2e83c519135d5ec859d6e (diff) | |
| download | openembedded-5d121d88280f78ca3bc5902d46d8ed058193d28e.tar.gz | |
Many places: Refer to ${HOST_SYS}-libtool not ${TARGET_PREFIX}libtool
Given that the libtool recipes install as ${HOST_SYS}-libtool
we need to reference it as such and not ${TARGET_PREFIX}libtool
as we will otherwise break when those evaluate differently.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/apr')
| -rw-r--r-- | recipes/apr/apr-util_1.3.4.bb | 2 | ||||
| -rw-r--r-- | recipes/apr/apr_1.3.12.bb | 2 | ||||
| -rw-r--r-- | recipes/apr/apr_1.3.3.bb | 2 | ||||
| -rw-r--r-- | recipes/apr/apr_1.3.5.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes/apr/apr-util_1.3.4.bb b/recipes/apr/apr-util_1.3.4.bb index 3a2284c4d0..a2c8211fd0 100644 --- a/recipes/apr/apr-util_1.3.4.bb +++ b/recipes/apr/apr-util_1.3.4.bb @@ -30,7 +30,7 @@ do_configure_prepend() { do_configure_append() { sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk sed -i /^LIBTOOL/d ${S}/build/rules.mk - echo LIBTOOL="${TARGET_PREFIX}libtool --tag=CC" >> ${S}/build/rules.mk + echo LIBTOOL="${HOST_SYS}-libtool --tag=CC" >> ${S}/build/rules.mk } diff --git a/recipes/apr/apr_1.3.12.bb b/recipes/apr/apr_1.3.12.bb index 60624c9e5b..38ed343ce4 100644 --- a/recipes/apr/apr_1.3.12.bb +++ b/recipes/apr/apr_1.3.12.bb @@ -28,7 +28,7 @@ do_install_append() { cp ${S}/build/apr_rules.mk ${D}${datadir}/apr/ sed -i s,apr_builddir=.*,apr_builddir=,g ${D}${datadir}/apr/apr_rules.mk sed -i s,apr_builders=.*,apr_builders=,g ${D}${datadir}/apr/apr_rules.mk - sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g ${D}${datadir}/apr/apr_rules.mk + sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${D}${datadir}/apr/apr_rules.mk sed -i s,\$\(apr_builders\),${D}${datadir}/apr/,g ${D}${datadir}/apr/apr_rules.mk cp ${S}/build/mkdir.sh ${D}${datadir}/apr/ cp ${S}/build/make_exports.awk ${D}${datadir}/apr/ diff --git a/recipes/apr/apr_1.3.3.bb b/recipes/apr/apr_1.3.3.bb index 3a49235842..22e399d271 100644 --- a/recipes/apr/apr_1.3.3.bb +++ b/recipes/apr/apr_1.3.3.bb @@ -24,7 +24,7 @@ do_stage() { 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,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-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/ diff --git a/recipes/apr/apr_1.3.5.bb b/recipes/apr/apr_1.3.5.bb index 955334f279..4f4c288175 100644 --- a/recipes/apr/apr_1.3.5.bb +++ b/recipes/apr/apr_1.3.5.bb @@ -24,7 +24,7 @@ do_stage() { 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,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-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/ |