diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-12 12:38:47 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-12 12:38:47 +0000 |
| commit | 3c51cc38941f4165eef3fb5a4ccfce11c102b5c7 (patch) | |
| tree | 6e074eeeffb030c3f5f100617aaac39660aa4f0d /rules/libx86.make | |
| parent | 12aafc5e63fb43b2dc666f2315b1853e248f37fc (diff) | |
| download | ptxdist-3c51cc38941f4165eef3fb5a4ccfce11c102b5c7.tar.gz ptxdist-3c51cc38941f4165eef3fb5a4ccfce11c102b5c7.tar.xz | |
* libx86.make:
fix ifdef ARCH_X86 -> PTXCONF_ARCH_X86
cleanups
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8500 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libx86.make')
| -rw-r--r-- | rules/libx86.make | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/rules/libx86.make b/rules/libx86.make index 28e7285f1..dc3c72109 100644 --- a/rules/libx86.make +++ b/rules/libx86.make @@ -1,7 +1,7 @@ # -*-makefile-*- # $Id: template-make 8008 2008-04-15 07:39:46Z mkl $ # -# Copyright (C) 2008 by +# Copyright (C) 2008 by mol@pengutronix.de # # See CREDITS for details about who has contributed to this project. # @@ -21,7 +21,7 @@ PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_LIBX86) += libx86 LIBX86_VERSION := 1.1 LIBX86 := libx86-$(LIBX86_VERSION) LIBX86_SUFFIX := tar.gz -LIBX86_URL := http://www.codon.org.uk/~mjg59/libx86/downloads//$(LIBX86).$(LIBX86_SUFFIX) +LIBX86_URL := http://www.codon.org.uk/~mjg59/libx86/downloads/$(LIBX86).$(LIBX86_SUFFIX) LIBX86_SOURCE := $(SRCDIR)/$(LIBX86).$(LIBX86_SUFFIX) LIBX86_DIR := $(BUILDDIR)/$(LIBX86) @@ -29,74 +29,50 @@ LIBX86_DIR := $(BUILDDIR)/$(LIBX86) # Get # ---------------------------------------------------------------------------- -$(STATEDIR)/libx86.get: - @$(call targetinfo, $@) - @$(call touch, $@) - $(LIBX86_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, LIBX86) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/libx86.extract: - @$(call targetinfo, $@) - @$(call clean, $(LIBX86_DIR)) - @$(call extract, LIBX86) - @$(call patchin, LIBX86) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- LIBX86_PATH := PATH=$(CROSS_PATH) LIBX86_ENV := $(CROSS_ENV) -ifndef ARCH_X86 # use emulator on non x86 architectures +ifndef PTXCONF_ARCH_X86 LIBX86_ENV += BACKEND=x86emu endif -# -# autoconf -# -LIBX86_AUTOCONF := $(CROSS_AUTOCONF_USR) - $(STATEDIR)/libx86.prepare: - @$(call targetinfo, $@) - @$(call clean, $(LIBX86_DIR)/config.cache) -# cd $(LIBX86_DIR) && \ -# $(LIBX86_PATH) $(LIBX86_ENV) \ -# ./configure $(LIBX86_AUTOCONF) - @$(call touch, $@) + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- $(STATEDIR)/libx86.compile: - @$(call targetinfo, $@) + @$(call targetinfo) cd $(LIBX86_DIR) && $(LIBX86_ENV) $(LIBX86_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- $(STATEDIR)/libx86.install: - @$(call targetinfo, $@) + @$(call targetinfo) @$(call install, LIBX86) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- $(STATEDIR)/libx86.targetinstall: - @$(call targetinfo, $@) + @$(call targetinfo) @$(call install_init, libx86) @$(call install_fixup, libx86,PACKAGE,libx86) @@ -112,7 +88,7 @@ $(STATEDIR)/libx86.targetinstall: @$(call install_finish, libx86) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |