diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-03 16:34:07 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-03 16:34:07 +0000 |
| commit | 48fc3ae8ff74ab7817a5687527c332faf51f7bd1 (patch) | |
| tree | 86ff5c00a7cba93755b3c4be939a22737acf3f51 /rules/cross-nasm.make | |
| parent | 3f349c6ab1cb118b7ccd1a1c7c1bc5689cbdee8e (diff) | |
| download | ptxdist-48fc3ae8ff74ab7817a5687527c332faf51f7bd1.tar.gz ptxdist-48fc3ae8ff74ab7817a5687527c332faf51f7bd1.tar.xz | |
* cross-nasm.make:
version bump to 2.02
* cross-nasm.in:
new
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8275 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/cross-nasm.make')
| -rw-r--r-- | rules/cross-nasm.make | 59 |
1 files changed, 3 insertions, 56 deletions
diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make index 9bd486934..6752f1150 100644 --- a/rules/cross-nasm.make +++ b/rules/cross-nasm.make @@ -2,7 +2,7 @@ # $Id$ # # Copyright (C) 2003 by Dan Kegel http://kegel.com -# 2006 by Marc Kleine-Bude <mkl@pengutronix.de> +# 2006-2008 by Marc Kleine-Bude <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -18,7 +18,7 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_NASM) += cross-nasm # # Paths and names # -CROSS_NASM_VERSION := 0.98.39 +CROSS_NASM_VERSION := 2.02 CROSS_NASM := nasm-$(CROSS_NASM_VERSION) CROSS_NASM_SUFFIX := tar.bz2 CROSS_NASM_URL := $(PTXCONF_SETUP_SFMIRROR)/nasm/$(CROSS_NASM).$(CROSS_NASM_SUFFIX) @@ -30,35 +30,14 @@ CROSS_NASM_DIR := $(CROSS_BUILDDIR)/$(CROSS_NASM) # Get # ---------------------------------------------------------------------------- -cross-nasm_get: $(STATEDIR)/cross-nasm.get - -$(STATEDIR)/cross-nasm.get: $(cross-nasm_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(CROSS_NASM_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, CROSS_NASM) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -cross-nasm_extract: $(STATEDIR)/cross-nasm.extract - -$(STATEDIR)/cross-nasm.extract: $(cross-nasm_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(CROSS_NASM_DIR)) - @$(call extract, CROSS_NASM, $(CROSS_BUILDDIR)) - @$(call patchin, CROSS_NASM, $(CROSS_NASM_DIR)) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -cross-nasm_prepare: $(STATEDIR)/cross-nasm.prepare - CROSS_NASM_PATH := PATH=$(CROSS_PATH) CROSS_NASM_ENV := $(HOSTCC_ENV) @@ -71,38 +50,6 @@ CROSS_NASM_AUTOCONF := \ --host=$(GNU_HOST) \ --build=$(GNU_HOST) -$(STATEDIR)/cross-nasm.prepare: $(cross-nasm_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(CROSS_NASM_DIR)/config.cache) - cd $(CROSS_NASM_DIR) && \ - $(CROSS_NASM_PATH) $(CROSS_NASM_ENV) \ - ./configure $(CROSS_NASM_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -cross-nasm_compile: $(STATEDIR)/cross-nasm.compile - -$(STATEDIR)/cross-nasm.compile: $(cross-nasm_compile_deps_default) - @$(call targetinfo, $@) - cd $(CROSS_NASM_DIR) && $(CROSS_NASM_ENV) $(CROSS_NASM_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -cross-nasm_install: $(STATEDIR)/cross-nasm.install - -cross-nasm_install_deps = $(cross-nasm_install_deps_default) - -$(STATEDIR)/cross-nasm.install: $(cross-nasm_install_deps_default) - @$(call targetinfo, $@) - @$(call install, CROSS_NASM,,h) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Clean # ---------------------------------------------------------------------------- |