[oe-commits] Khem Raj : js_1.5.bb: Use gcc to link shared library and not bare ld

[git version control]

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

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Dec 13 13:40:52 2010 -0800

js_1.5.bb: Use gcc to link shared library and not bare ld

Get rid of do_stage while here

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/js/js/ld.patch |   13 +++++++++++++
 recipes/js/js_1.5.bb   |    9 ++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/recipes/js/js/ld.patch b/recipes/js/js/ld.patch
new file mode 100644
index 0000000..e67a4e7
--- /dev/null
+++ b/recipes/js/js/ld.patch
@@ -0,0 +1,13 @@
+Index: src/config/Linux_All.mk
+===================================================================
+--- src.orig/config/Linux_All.mk	2010-12-13 21:34:05.189656981 +0000
++++ src/config/Linux_All.mk	2010-12-13 21:35:02.849657511 +0000
+@@ -47,7 +47,7 @@
+ OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
+ 
+ RANLIB = echo
+-MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
++MKSHLIB = $(CC) -shared $(XMKSHLIBOPTS)
+ 
+ #.c.o:
+ #      $(CC) -c -MD $*.d $(CFLAGS) $<
diff --git a/recipes/js/js_1.5.bb b/recipes/js/js_1.5.bb
index 869fd88..4524ff1 100644
--- a/recipes/js/js_1.5.bb
+++ b/recipes/js/js_1.5.bb
@@ -3,10 +3,11 @@ LICENSE = "GPL"
 SECTION = "libs/network"
 DEPENDS = "readline ncurses" 
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \
 	   file://libtermcap.patch \
+	   file://ld.patch \
            file://jsautocfg.h"
 S = "${WORKDIR}/js/src"
 
@@ -29,12 +30,6 @@ do_install() {
 	install -m 0644 ${S}/*.h ${D}${includedir}/js
 }
 
-do_stage() {
-	install -d ${STAGING_INCDIR}/js
-	install -m 0644 ${S}/*.h ${STAGING_INCDIR}/js/
-	oe_libinstall -so -C Linux_All_DBG.OBJ libjs ${STAGING_LIBDIR}
-}
-
 FILES_${PN} = "${libdir}/lib*.so"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"