klcc-cross_2.0.2: refactor recipe to respect exec_prefix

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>

2 files changed, 4 insertions, 31 deletions

diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb
index b30d16551f..17ae0c10b6 100644
--- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb
@@ -3,10 +3,7 @@ PR = "${INC_PR}.0"
 require klibc.inc
 SUMMARY = "The klcc crosscompiler for klibc"
 
-export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc"
-
-SRC_URI += "file://klcc_prefix.patch \
-            file://use-env-for-perl.patch"
+SRC_URI += "file://use-env-for-perl.patch"
 
 DEPENDS = "klibc"
 
@@ -19,10 +16,10 @@ do_configure () {
 }
 
 do_compile() {
-    oe_runmake klcc
+    oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${target_libdir}/klibc' klcc
 }
 
 do_install() {
-    install -d ${D}${base_bindir}
-    install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc
+    install -d ${D}${bindir}
+    install -m 0755 klcc/klcc ${D}${bindir}/${TARGET_PREFIX}klcc
 }
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klcc_prefix.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klcc_prefix.patch
deleted file mode 100644
index a4a0026e4d..0000000000
--- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klcc_prefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch was imported from the OpenEmbedded git server
-(git://git.openembedded.org/openembedded)
-as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
-Index: klibc-1.5.19/klcc/Kbuild
-===================================================================
---- --- klibc-1.5.19.orig/klcc/Kbuild   2010-07-07 14:07:48.000000000 +0200
-+++ --- klibc-1.5.19./klcc/Kbuild       2010-08-18 23:39:23.000000000 +0200
-@@ -22,10 +22,10 @@
-        $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
-        $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
-        $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
--       $(Q)echo 'prefix=$(INSTALLDIR)' >> $@
--       $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
--       $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
--       $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
-+       $(Q)echo 'prefix=$(KLCC_INST)' >> $@
-+       $(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@
-+       $(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@
-+       $(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@
- 
- 
- # Generate klcc