diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-22 12:18:37 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-23 10:55:58 +0200 |
commit | f15b871730931c621e957cbeb0269aa884b3e682 (patch) | |
tree | 1773d2e7b7678c612a1f11881c213f4a9f22cd11 /rules/js.make | |
parent | 9cefa99a862be4483f2a25ac038c46086171ae86 (diff) | |
download | ptxdist-f15b871730931c621e957cbeb0269aa884b3e682.tar.gz ptxdist-f15b871730931c621e957cbeb0269aa884b3e682.tar.xz |
js: remove now obsolete extract stage & cleanup
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/js.make')
-rw-r--r-- | rules/js.make | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/rules/js.make b/rules/js.make index 77b759b14..e4fa8a99b 100644 --- a/rules/js.make +++ b/rules/js.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2010 by Robert Schwebel <r.schwebel@pengutronix.de> +# 2011 by Michael Olbrich <m.olbrich@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -23,37 +24,13 @@ JS_SUFFIX := tar.bz2 JS_URL := http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$(JS_VERSION)/source/xulrunner-$(JS_VERSION).source.$(JS_SUFFIX) JS_SOURCE := $(SRCDIR)/xulrunner-$(JS_VERSION).source.$(JS_SUFFIX) JS_DIR := $(BUILDDIR)/$(JS) +JS_SUBDIR := js/src JS_LICENSE := unknown # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(JS_SOURCE): - @$(call targetinfo) - @$(call get, JS) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/js.extract: - @$(call targetinfo) - @$(call clean, $(JS_DIR)) - @$(call extract, JS) - # we have a crappy name - the packet is called 'xulrunner-$version', - # but extracts to 'mozilla-$version' - mv $(BUILDDIR)/mozilla-1.9.2/js/src $(JS_DIR) - rm -fr $(BUILDDIR)/js - @$(call patchin, JS) - @$(call touch) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -JS_PATH := PATH=$(CROSS_PATH) - JS_CONF_ENV := \ $(CROSS_ENV) \ ac_cv_path_DOXYGEN=/bin/true \ @@ -147,36 +124,11 @@ JS_CONF_OPT := \ # --with-static-checking=path/to/gcc_dehydra.so # Enable static checking of code using GCC-dehydra -$(STATEDIR)/js.prepare: - @$(call targetinfo) - @$(call clean, $(JS_DIR)/config.cache) - cd $(JS_DIR) && \ - $(JS_PATH) $(JS_CONF_ENV) \ - ./configure $(JS_CONF_OPT) - @$(call touch) - # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -$(STATEDIR)/js.compile: - @$(call targetinfo) - cd $(JS_DIR) && $(JS_PATH) $(MAKE) \ - $(PARALLELMFLAGS) \ - HOST_CXX=g++ \ - HOST_CC=gcc -# cd $(JS_DIR)/src && $(JS_PATH) $(MAKE) -f Makefile.ref \ -# $(PARALLELMFLAGS_BROKEN) \ -# OS_ARCH=Linux \ -# CC=$(CROSS_CC) \ -# CCC=$(CROSS_CXX) \ -# AR=$(CROSS_AR) \ -# LD=$(CROSS_LD) \ -# HOST_CC=gcc \ -# CPU_ARCH=$(PTXCONF_ARCH_STRING) \ -# CROSS_COMPILE=1 \ -# JS_EDITLINE=1 - @$(call touch) +JS_MAKE_OPT := HOST_CXX=$(HOSTCXX) HOST_CC=$(HOSTCC) # ---------------------------------------------------------------------------- # Target-Install |