[oe-commits] Andrea Adami : klibc: add klcc_prefix.patch, bump PR.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a29bf15b9c9c0d15f96c254b2ed830e104ae3436
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a29bf15b9c9c0d15f96c254b2ed830e104ae3436

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Thu Aug 19 00:16:36 2010 +0200

klibc: add klcc_prefix.patch, bump PR.

* staging of klcc doesn't yet happen...WIP

---

 recipes/klibc/klibc-1.5.19/klcc_prefix.patch |   19 +++++++++++++++++++
 recipes/klibc/klibc.inc                      |    3 ++-
 recipes/klibc/klibc_1.5.19.bb                |    7 ++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/recipes/klibc/klibc-1.5.19/klcc_prefix.patch b/recipes/klibc/klibc-1.5.19/klcc_prefix.patch
new file mode 100644
index 0000000..e4fe241
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.19/klcc_prefix.patch
@@ -0,0 +1,19 @@
+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
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index 9111dde..ab28e2f 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -6,7 +6,7 @@ minimal entaglement, and portability, not speed."
 LICENSE = "BSD-ADV"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r0"
+INC_PR = "r1"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
@@ -38,6 +38,7 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
             file://socket.h.patch \
             file://isystem.patch \
             file://getrusage.patch \
+            file://klcc_prefix.patch \
             "
 
 S = "${WORKDIR}/klibc-${PV}"
diff --git a/recipes/klibc/klibc_1.5.19.bb b/recipes/klibc/klibc_1.5.19.bb
index 98075c4..c37dae9 100644
--- a/recipes/klibc/klibc_1.5.19.bb
+++ b/recipes/klibc/klibc_1.5.19.bb
@@ -1,7 +1,10 @@
 PR = "${INC_PR}.0"
 
+export INST=${D}
+export KLCC_INST=${STAGING_DIR_TARGET}/lib/klibc
+
 do_install() {
-	oe_runmake install
+        oe_runmake install
         install -d ${D}${base_bindir}
         install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh
         install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit
@@ -12,8 +15,6 @@ do_install() {
         install -m 755 klcc/klcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc
 }
 
-export INST=${D}
-
 PACKAGES = "${PN} ${PN}-dev "
 FILES_${PN} = "${base_libdir}/klibc-*.so"
 FILES_${PN}-dev = "${base_libdir}/klibc.so"