[oe-commits] org.oe.dreambox klibc: fix install

[tmbinc commit]

klibc: fix install

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 52e5510d902a3a4f742346a6621da7a37d4ae2c9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=52e5510d902a3a4f742346a6621da7a37d4ae2c9
Files:
1
packages/klibc/klibc-1.5
packages/klibc/klibc-1.5/install.patch
packages/klibc/klibc_1.5.bb
packages/klibc/klibc.inc
Diffs:

#
# mt diff -recdb3a408cb2529255567ef259f8940c04b861cf -r52e5510d902a3a4f742346a6621da7a37d4ae2c9
#
# 
# 
# add_dir "packages/klibc/klibc-1.5"
# 
# add_file "packages/klibc/klibc-1.5/install.patch"
#  content [2f1750d9d9878555c08822f916b8612f65ef2027]
# 
# add_file "packages/klibc/klibc_1.5.bb"
#  content [97da9235f69cc035927d6566f0dc0ed7585a8ec4]
# 
# patch "packages/klibc/klibc.inc"
#  from [ee8a44e1fa9c9f24022d7a1063f20fa26fd577d6]
#    to [39faf6e62e3559aa3bdabadcf4f3cd9eb6f175d8]
# 
============================================================
--- packages/klibc/klibc-1.5/install.patch	2f1750d9d9878555c08822f916b8612f65ef2027
+++ packages/klibc/klibc-1.5/install.patch	2f1750d9d9878555c08822f916b8612f65ef2027
@@ -0,0 +1,10 @@
+--- klibc-1.5/usr/klibc/Kbuild_org	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/Kbuild	2007-05-30 12:40:56.000000000 +0200
+@@ -175,5 +175,5 @@
+ 	          $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
+ 	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+ 	                      $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
+-	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+-	                      $(INSTALLROOT)$(SHLIBDIR)
++	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
++	                      $(INSTALLROOT)$(INSTALLDIR)$(SHLIBDIR)
============================================================
--- packages/klibc/klibc_1.5.bb	97da9235f69cc035927d6566f0dc0ed7585a8ec4
+++ packages/klibc/klibc_1.5.bb	97da9235f69cc035927d6566f0dc0ed7585a8ec4
@@ -0,0 +1 @@
+require klibc.inc
============================================================
--- packages/klibc/klibc.inc	ee8a44e1fa9c9f24022d7a1063f20fa26fd577d6
+++ packages/klibc/klibc.inc	39faf6e62e3559aa3bdabadcf4f3cd9eb6f175d8
@@ -65,6 +65,10 @@ do_stage() {
 			install
 	# The following is sufficient, at least in klibc 1.1.1 to make klcc
 	# use the staged libraries and include files.
+
+	if [ -f ${STAGING_BINDIR}/klcc ]; then 
+		mv ${STAGING_BINDIR}/klcc ${STAGING_BINDIR}/${TARGET_PREFIX}klcc; 
+	fi
 	sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \
 		'${STAGING_BINDIR}/${TARGET_PREFIX}klcc'
 }