3 files changed, 15 insertions, 17 deletions

diff --git a/meta/packages/js/files/host-cc.patch b/meta/packages/js/files/host-cc.patch
deleted file mode 100644
index 78a1e1b5a0..0000000000
--- a/meta/packages/js/files/host-cc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urNd smjs-1.5-r0/js/src/Makefile.ref smjs-1.5-r0.new/js/src/Makefile.ref
---- smjs-1.5-r0/js/src/Makefile.ref     2003-11-15 00:10:55.000000000 +0000
-+++ smjs-1.5-r0.new/js/src/Makefile.ref 2006-01-31 23:43:16.000000000 +0000
-@@ -317,8 +317,11 @@
-        rm -f $@
-        $(OBJDIR)/jscpucfg > $@
- 
-+$(OBJDIR)/jscpucfg.o: jscpucfg.c jscpucfg.h
-+       $(HOST_CC) -o $@ $(CFLAGS) $(LDFLAGS) jscpucfg.c
-+
- $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
--       $(CC) -o $@ $(OBJDIR)/jscpucfg.o
-+       $(HOST_CC) -o $@ $(OBJDIR)/jscpucfg.o
- 
- # Look in OBJDIR to find jsautocfg.h
- INCLUDES   += -I$(OBJDIR)
diff --git a/meta/packages/js/files/link_with_gcc.patch b/meta/packages/js/files/link_with_gcc.patch
new file mode 100644
index 0000000000..d74b94f378
--- /dev/null
+++ b/meta/packages/js/files/link_with_gcc.patch
@@ -0,0 +1,13 @@
+Index: src/config/Linux_All.mk
+===================================================================
+--- src.orig/config/Linux_All.mk        2005-05-10 19:53:44.000000000 +0000
++++ src/config/Linux_All.mk     2007-06-18 17:20:05.000000000 +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/meta/packages/js/js_1.5.bb b/meta/packages/js/js_1.5.bb
index 5f8323769f..255fb55d7a 100644
--- a/meta/packages/js/js_1.5.bb
+++ b/meta/packages/js/js_1.5.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "A JavaScript engine"
 SECTION = "libs"
 DEPENDS = "readline"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.5.tar.gz \
+           file://link_with_gcc.patch;patch=1 \
            file://jsautocfg.h"
 
 S = "${WORKDIR}/js/src"
@@ -10,7 +11,7 @@ S = "${WORKDIR}/js/src"
 FILES_${PN} = "${libdir}/lib*.so"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
 
-EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=-L${STAGING_LIBDIR} -soname=libjs'"
+EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=${LDFLAGS} -Wl,-soname=libjs'"
 
 do_compile_prepend() {
         cp ${WORKDIR}/jsautocfg.h ${S}/