diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
| commit | 4ee358534793381d2e87b01781079a3354fd5c1c (patch) | |
| tree | 729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes/js | |
| parent | beb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff) | |
| parent | eda06ec3dde6169a46797f876a82499c4fff8f62 (diff) | |
| download | openembedded-324a7c75ac7f591e950836686bfe14332ce6586b.tar.gz | |
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
Diffstat (limited to 'recipes/js')
| -rw-r--r-- | recipes/js/files/host-cc.patch | 16 | ||||
| -rw-r--r-- | recipes/js/js/arm/jsautocfg.h (renamed from recipes/js/files/arm/jsautocfg.h) | 0 | ||||
| -rw-r--r-- | recipes/js/js/jsautocfg.h (renamed from recipes/js/files/jsautocfg.h) | 0 | ||||
| -rw-r--r-- | recipes/js/js/libtermcap.patch | 13 | ||||
| -rw-r--r-- | recipes/js/js/powerpc/jsautocfg.h (renamed from recipes/js/files/powerpc/jsautocfg.h) | 0 | ||||
| -rw-r--r-- | recipes/js/js_1.5.bb | 5 |
6 files changed, 16 insertions, 18 deletions
diff --git a/recipes/js/files/host-cc.patch b/recipes/js/files/host-cc.patch deleted file mode 100644 index 78a1e1b5a0..0000000000 --- a/recipes/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/recipes/js/files/arm/jsautocfg.h b/recipes/js/js/arm/jsautocfg.h index 7e8171fc23..7e8171fc23 100644 --- a/recipes/js/files/arm/jsautocfg.h +++ b/recipes/js/js/arm/jsautocfg.h diff --git a/recipes/js/files/jsautocfg.h b/recipes/js/js/jsautocfg.h index ac786dcdad..ac786dcdad 100644 --- a/recipes/js/files/jsautocfg.h +++ b/recipes/js/js/jsautocfg.h diff --git a/recipes/js/js/libtermcap.patch b/recipes/js/js/libtermcap.patch new file mode 100644 index 0000000000..045b4fb565 --- /dev/null +++ b/recipes/js/js/libtermcap.patch @@ -0,0 +1,13 @@ +Index: src/Makefile.ref +=================================================================== +--- src.orig/Makefile.ref ++++ src/Makefile.ref +@@ -127,7 +127,7 @@ endif + ifdef JS_READLINE + # For those platforms with the readline library installed. + DEFINES += -DEDITLINE +-PROG_LIBS += -lreadline -ltermcap ++PROG_LIBS += -lreadline -lncurses + else + ifdef JS_EDITLINE + # Use the editline library, built locally. diff --git a/recipes/js/files/powerpc/jsautocfg.h b/recipes/js/js/powerpc/jsautocfg.h index 93d03744f2..93d03744f2 100644 --- a/recipes/js/files/powerpc/jsautocfg.h +++ b/recipes/js/js/powerpc/jsautocfg.h diff --git a/recipes/js/js_1.5.bb b/recipes/js/js_1.5.bb index eb92b24a63..f9aba904aa 100644 --- a/recipes/js/js_1.5.bb +++ b/recipes/js/js_1.5.bb @@ -1,11 +1,12 @@ DESCRIPTION = "A JavaScript engine" LICENSE = "GPL" SECTION = "libs/network" -DEPENDS = "readline" +DEPENDS = "readline ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \ + file://libtermcap.patch \ file://jsautocfg.h" S = "${WORKDIR}/js/src" |