From: Stefan Schmidt Date: Fri, 29 Oct 2010 14:27:33 +0000 (+0100) Subject: cacaoh-*native: Don't rely on host libtool X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b7b712dc5ff95238d36ee157128cdad3e2fdd7b;p=openembedded.git cacaoh-*native: Don't rely on host libtool Reported-by: Martin Jansa Signed-off-by: Stefan Schmidt --- diff --git a/recipes/cacao/cacaoh-cldc-native_0.98.bb b/recipes/cacao/cacaoh-cldc-native_0.98.bb index 977743374d..5b0b118df8 100644 --- a/recipes/cacao/cacaoh-cldc-native_0.98.bb +++ b/recipes/cacao/cacaoh-cldc-native_0.98.bb @@ -5,7 +5,7 @@ SRC_URI = "\ " do_stage() { - libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${STAGING_BINDIR}/cacaoh-cldc-${PV} + ${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${STAGING_BINDIR}/cacaoh-cldc-${PV} } SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346" diff --git a/recipes/cacao/cacaoh-native.inc b/recipes/cacao/cacaoh-native.inc index 655bb0c54a..f40497b16b 100644 --- a/recipes/cacao/cacaoh-native.inc +++ b/recipes/cacao/cacaoh-native.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.cacaojvm.org/" LICENSE = "GPL" DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native" -INC_PR = "r4" +INC_PR = "r5" S = "${WORKDIR}/cacao-${PV}" @@ -24,7 +24,7 @@ do_compile() { do_install() { install -d ${D}${bindir}/cacaoh-${PV} - libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${D}${bindir}/cacaoh-${PV} + ${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${D}${bindir}/cacaoh-${PV} } NATIVE_INSTALL_WORKS = "1" diff --git a/recipes/cacao/cacaoh-openjdk-native.inc b/recipes/cacao/cacaoh-openjdk-native.inc index e290a24cf9..32f0a5e607 100644 --- a/recipes/cacao/cacaoh-openjdk-native.inc +++ b/recipes/cacao/cacaoh-openjdk-native.inc @@ -25,5 +25,5 @@ do_compile() { } do_install() { - libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${STAGING_BINDIR}/cacaoh-openjdk-${PV} + ${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${STAGING_BINDIR}/cacaoh-openjdk-${PV} } diff --git a/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb b/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb index 3f2686fc44..fefd397655 100644 --- a/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb +++ b/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb @@ -1,6 +1,6 @@ require cacaoh-openjdk-native.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "63220327925ace13756ae334c55a3baa" SRC_URI[sha256sum] = "1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56"