summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/broken/xchain-nasm.make136
-rw-r--r--rules/cross-nasm.make115
2 files changed, 115 insertions, 136 deletions
diff --git a/rules/broken/xchain-nasm.make b/rules/broken/xchain-nasm.make
deleted file mode 100644
index ef94eb93a..000000000
--- a/rules/broken/xchain-nasm.make
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Dan Kegel http://kegel.com
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_NASM) += xchain-nasm
-
-#
-# Paths and names
-#
-XCHAIN_NASM_VERSION = 0.98.38
-XCHAIN_NASM = nasm-$(XCHAIN_NASM_VERSION)
-XCHAIN_NASM_SUFFIX = tar.bz2
-XCHAIN_NASM_URL = $(PTXCONF_SETUP_SFMIRROR)/nasm/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX)
-XCHAIN_NASM_SOURCE = $(SRCDIR)/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX)
-XCHAIN_NASM_DIR = $(BUILDDIR)/$(XCHAIN_NASM)
-
-include $(call package_depfile)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-xchain-nasm_get: $(STATEDIR)/xchain-nasm.get
-
-xchain-nasm_get_deps = $(XCHAIN_NASM_SOURCE)
-
-$(STATEDIR)/xchain-nasm.get: $(xchain-nasm_get_deps)
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
-$(XCHAIN_NASM_SOURCE):
- @$(call targetinfo, $@)
- @$(call get, $(XCHAIN_NASM_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-xchain-nasm_extract: $(STATEDIR)/xchain-nasm.extract
-
-xchain-nasm_extract_deps = $(STATEDIR)/xchain-nasm.get
-
-$(STATEDIR)/xchain-nasm.extract: $(xchain-nasm_extract_deps)
- @$(call targetinfo, $@)
- @$(call clean, $(XCHAIN_NASM_DIR))
- @$(call extract, $(XCHAIN_NASM_SOURCE))
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-xchain-nasm_prepare: $(STATEDIR)/xchain-nasm.prepare
-
-#
-# dependencies
-#
-xchain-nasm_prepare_deps = \
- $(STATEDIR)/xchain-nasm.extract
-
-
-XCHAIN_NASM_PATH = PATH=$(CROSS_PATH)
-XCHAIN_NASM_ENV = $(HOSTCC_ENV)
-
-#
-# autoconf
-#
-XCHAIN_NASM_AUTOCONF = \
- --target=$(PTXCONF_GNU_TARGET) \
- --host=$(GNU_HOST) \
- --build=$(GNU_HOST) \
- --prefix=$(PTXCONF_PREFIX)
-
-$(STATEDIR)/xchain-nasm.prepare: $(xchain-nasm_prepare_deps)
- @$(call targetinfo, $@)
- @$(call clean, $(XCHAIN_NASM_BUILDDIR))
- cd $(XCHAIN_NASM_DIR) && \
- $(XCHAIN_NASM_PATH) $(XCHAIN_NASM_ENV) \
- ./configure $(XCHAIN_NASM_AUTOCONF)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-xchain-nasm_compile: $(STATEDIR)/xchain-nasm.compile
-
-xchain-nasm_compile_deps = $(STATEDIR)/xchain-nasm.prepare
-
-$(STATEDIR)/xchain-nasm.compile: $(xchain-nasm_compile_deps)
- @$(call targetinfo, $@)
- $(XCHAIN_NASM_PATH) make -C $(XCHAIN_NASM_DIR)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-xchain-nasm_install: $(STATEDIR)/xchain-nasm.install
-
-$(STATEDIR)/xchain-nasm.install: $(STATEDIR)/xchain-nasm.compile
- @$(call targetinfo, $@)
- @$(call install, XCHAIN_NASM)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-xchain-nasm_targetinstall: $(STATEDIR)/xchain-nasm.targetinstall
-
-xchain-nasm_targetinstall_deps = $(STATEDIR)/xchain-nasm.install
-
-$(STATEDIR)/xchain-nasm.targetinstall: $(xchain-nasm_targetinstall_deps)
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-nasm_clean:
- rm -rf $(STATEDIR)/xchain-nasm.*
- rm -rf $(XCHAIN_NASM_DIR)
-
-# vim: syntax=make
diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make
new file mode 100644
index 000000000..5d49d4960
--- /dev/null
+++ b/rules/cross-nasm.make
@@ -0,0 +1,115 @@
+# -*-makefile-*-
+# $Id$
+#
+# Copyright (C) 2003 by Dan Kegel http://kegel.com
+# 2006 by Marc Kleine-Bude <mkl@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+CROSS_PACKAGES-$(PTXCONF_CROSS_NASM) += cross-nasm
+
+#
+# Paths and names
+#
+CROSS_NASM_VERSION := 0.98.39
+CROSS_NASM := nasm-$(CROSS_NASM_VERSION)
+CROSS_NASM_SUFFIX := tar.bz2
+CROSS_NASM_URL := $(PTXCONF_SETUP_SFMIRROR)/nasm/$(CROSS_NASM).$(CROSS_NASM_SUFFIX)
+CROSS_NASM_SOURCE := $(SRCDIR)/$(CROSS_NASM).$(CROSS_NASM_SUFFIX)
+CROSS_NASM_DIR := $(CROSS_BUILDDIR)/$(CROSS_NASM)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# 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 get, $(CROSS_NASM_URL))
+
+# ----------------------------------------------------------------------------
+# 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_SOURCE), $(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)
+
+#
+# autoconf
+#
+CROSS_NASM_AUTOCONF := \
+ --prefix=$(PTXCONF_PREFIX)/gcc-$(GCC_VERSION)-glibc-$(GLIBC_VERSION)/$(PTXCONF_GNU_TARGET) \
+ --target=$(PTXCONF_GNU_TARGET) \
+ --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
+# ----------------------------------------------------------------------------
+
+cross-nasm_clean:
+ rm -rf $(STATEDIR)/cross-nasm.*
+ rm -rf $(CROSS_NASM_DIR)
+
+# vim: syntax=make