From 57c7dda03e5067e60177d06d08fdd4322225148c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 10 Jun 2010 22:12:55 +0100 Subject: js: Fix mips build and other architecture inconsistency Signed-off-by: Richard Purdie --- meta/packages/js/files/usepic.patch | 24 ++++++++++++++++++++++++ meta/packages/js/js_1.5.bb | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta/packages/js/files/usepic.patch diff --git a/meta/packages/js/files/usepic.patch b/meta/packages/js/files/usepic.patch new file mode 100644 index 0000000000..ddd31be9cb --- /dev/null +++ b/meta/packages/js/files/usepic.patch @@ -0,0 +1,24 @@ +Mips needs -fPIC to compile properly. These tests are broken anyway as they test +the build system architecture, not the target. This is a hack. + +RP 10/6/2010 + +Index: src/config/Linux_All.mk +=================================================================== +--- src.orig/config/Linux_All.mk 2010-06-10 22:09:43.000000000 +0100 ++++ src/config/Linux_All.mk 2010-06-10 22:09:55.000000000 +0100 +@@ -90,14 +90,10 @@ + # Use the editline library to provide line-editing support. + JS_EDITLINE = 1 + +-ifeq ($(CPU_ARCH),x86_64) + # Use VA_COPY() standard macro on x86-64 + # FIXME: better use it everywhere + OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy +-endif + +-ifeq ($(CPU_ARCH),x86_64) + # We need PIC code for shared libraries + # FIXME: better patch rules.mk & fdlibm/Makefile* + OS_CFLAGS += -DPIC -fPIC +-endif diff --git a/meta/packages/js/js_1.5.bb b/meta/packages/js/js_1.5.bb index 1249268a4f..ce763338d3 100644 --- a/meta/packages/js/js_1.5.bb +++ b/meta/packages/js/js_1.5.bb @@ -4,7 +4,9 @@ SECTION = "libs" DEPENDS = "readline" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \ file://link_with_gcc.patch;patch=1 \ - file://jsautocfg.h" + file://usepic.patch;patch=1 \ + file://jsautocfg.h" +PR = "r1" S = "${WORKDIR}/js/src" -- cgit v1.2.3-54-g00ecf