summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-06-30 19:28:57 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-07-03 20:09:12 (GMT)
commite21db000267cfbff000f1fc8c8e3329c5473ce1e (patch)
tree11f5cf5ce57f7f6601bb165fcf465c1dbfe97108
parent3c3211ccde7fc37aaf9192e83cb55d7159001c17 (diff)
downloadbuildroot-e21db000267cfbff000f1fc8c8e3329c5473ce1e.tar.gz
buildroot-e21db000267cfbff000f1fc8c8e3329c5473ce1e.tar.bz2
elf2flt: convert to the package infrastructure
[Peter: Correct legacy position] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--Config.in.legacy8
-rw-r--r--package/elf2flt/Config.in.host (renamed from toolchain/elf2flt/Config.in)2
-rw-r--r--package/elf2flt/elf2flt.mk28
-rw-r--r--package/elf2flt/src/LICENSE.TXT (renamed from toolchain/elf2flt/elf2flt/LICENSE.TXT)0
-rw-r--r--package/elf2flt/src/Makefile.in (renamed from toolchain/elf2flt/elf2flt/Makefile.in)0
-rw-r--r--package/elf2flt/src/README (renamed from toolchain/elf2flt/elf2flt/README)0
-rwxr-xr-xpackage/elf2flt/src/config.guess (renamed from toolchain/elf2flt/elf2flt/config.guess)0
-rwxr-xr-xpackage/elf2flt/src/config.sub (renamed from toolchain/elf2flt/elf2flt/config.sub)0
-rwxr-xr-xpackage/elf2flt/src/configure (renamed from toolchain/elf2flt/elf2flt/configure)0
-rw-r--r--package/elf2flt/src/configure.in (renamed from toolchain/elf2flt/elf2flt/configure.in)0
-rw-r--r--package/elf2flt/src/cygwin-elf.h (renamed from toolchain/elf2flt/elf2flt/cygwin-elf.h)0
-rw-r--r--package/elf2flt/src/e1-elf2flt.ld (renamed from toolchain/elf2flt/elf2flt/e1-elf2flt.ld)0
-rw-r--r--package/elf2flt/src/elf2flt.c (renamed from toolchain/elf2flt/elf2flt/elf2flt.c)0
-rw-r--r--package/elf2flt/src/elf2flt.ld (renamed from toolchain/elf2flt/elf2flt/elf2flt.ld)0
-rw-r--r--package/elf2flt/src/flat.h (renamed from toolchain/elf2flt/elf2flt/flat.h)0
-rw-r--r--package/elf2flt/src/flthdr.c (renamed from toolchain/elf2flt/elf2flt/flthdr.c)0
-rwxr-xr-xpackage/elf2flt/src/install-sh (renamed from toolchain/elf2flt/elf2flt/install-sh)0
-rw-r--r--package/elf2flt/src/ld-elf2flt.in (renamed from toolchain/elf2flt/elf2flt/ld-elf2flt.in)0
-rwxr-xr-xpackage/elf2flt/src/maketarball.sh (renamed from toolchain/elf2flt/elf2flt/maketarball.sh)0
-rw-r--r--package/elf2flt/src/stubs.c (renamed from toolchain/elf2flt/elf2flt/stubs.c)0
-rw-r--r--toolchain/elf2flt/elf2flt.mk46
-rw-r--r--toolchain/toolchain-buildroot.mk1
-rw-r--r--toolchain/toolchain-buildroot/Config.in.22
-rw-r--r--toolchain/toolchain-crosstool-ng.mk1
-rw-r--r--toolchain/toolchain-external.mk1
25 files changed, 38 insertions, 51 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 921a0eb..01bf900 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -68,6 +68,14 @@ config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS
help
mkdosfs was renamed upstream to mkfs.fat for consistency.
+config BR2_ELF2FLT
+ bool "the elf2flt option has been renamed"
+ select BR2_LEGACY
+ help
+ The BR2_ELF2FLT option has been renamed to
+ BR2_PACKAGE_HOST_ELF2FLT due to the conversion of elf2flt to
+ the package infrastructure.
+
###############################################################################
comment "Legacy options removed in 2013.05"
diff --git a/toolchain/elf2flt/Config.in b/package/elf2flt/Config.in.host
index b4e450a..31a6c7f 100644
--- a/toolchain/elf2flt/Config.in
+++ b/package/elf2flt/Config.in.host
@@ -1,4 +1,4 @@
-config BR2_ELF2FLT
+config BR2_PACKAGE_HOST_ELF2FLT
bool "Enable elf2flt support?"
depends on BR2_arm || BR2_sh || BR2_sparc
help
diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
new file mode 100644
index 0000000..5afa5ca
--- /dev/null
+++ b/package/elf2flt/elf2flt.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# elf2flt
+#
+#############################################################
+
+ELF2FLT_SOURCE =
+HOST_ELF2FLT_SOURCE =
+ELF2FLT_VERSION = cvs
+ELF2FLT_LICENSE = GPLv2+
+ELF2FLT_LICENSE_FILES = LICENSE.TXT
+
+HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
+
+# It is not exactly a host variant, but more a cross variant, which is
+# why we pass a special --target option.
+HOST_ELF2FLT_CONF_OPT = \
+ --with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
+ --with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
+ --with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
+ --with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
+ --target=$(GNU_TARGET_NAME)
+
+define HOST_ELF2FLT_EXTRACT_CMDS
+ cp -r package/elf2flt/src/* $(@D)
+endef
+
+$(eval $(host-autotools-package))
diff --git a/toolchain/elf2flt/elf2flt/LICENSE.TXT b/package/elf2flt/src/LICENSE.TXT
index 5b6e7c6..5b6e7c6 100644
--- a/toolchain/elf2flt/elf2flt/LICENSE.TXT
+++ b/package/elf2flt/src/LICENSE.TXT
diff --git a/toolchain/elf2flt/elf2flt/Makefile.in b/package/elf2flt/src/Makefile.in
index acead9f..acead9f 100644
--- a/toolchain/elf2flt/elf2flt/Makefile.in
+++ b/package/elf2flt/src/Makefile.in
diff --git a/toolchain/elf2flt/elf2flt/README b/package/elf2flt/src/README
index 6e8a687..6e8a687 100644
--- a/toolchain/elf2flt/elf2flt/README
+++ b/package/elf2flt/src/README
diff --git a/toolchain/elf2flt/elf2flt/config.guess b/package/elf2flt/src/config.guess
index afcb19c..afcb19c 100755
--- a/toolchain/elf2flt/elf2flt/config.guess
+++ b/package/elf2flt/src/config.guess
diff --git a/toolchain/elf2flt/elf2flt/config.sub b/package/elf2flt/src/config.sub
index 2072457..2072457 100755
--- a/toolchain/elf2flt/elf2flt/config.sub
+++ b/package/elf2flt/src/config.sub
diff --git a/toolchain/elf2flt/elf2flt/configure b/package/elf2flt/src/configure
index d672662..d672662 100755
--- a/toolchain/elf2flt/elf2flt/configure
+++ b/package/elf2flt/src/configure
diff --git a/toolchain/elf2flt/elf2flt/configure.in b/package/elf2flt/src/configure.in
index 73443c6..73443c6 100644
--- a/toolchain/elf2flt/elf2flt/configure.in
+++ b/package/elf2flt/src/configure.in
diff --git a/toolchain/elf2flt/elf2flt/cygwin-elf.h b/package/elf2flt/src/cygwin-elf.h
index 2523c0e..2523c0e 100644
--- a/toolchain/elf2flt/elf2flt/cygwin-elf.h
+++ b/package/elf2flt/src/cygwin-elf.h
diff --git a/toolchain/elf2flt/elf2flt/e1-elf2flt.ld b/package/elf2flt/src/e1-elf2flt.ld
index a88fc4f..a88fc4f 100644
--- a/toolchain/elf2flt/elf2flt/e1-elf2flt.ld
+++ b/package/elf2flt/src/e1-elf2flt.ld
diff --git a/toolchain/elf2flt/elf2flt/elf2flt.c b/package/elf2flt/src/elf2flt.c
index 65a116c..65a116c 100644
--- a/toolchain/elf2flt/elf2flt/elf2flt.c
+++ b/package/elf2flt/src/elf2flt.c
diff --git a/toolchain/elf2flt/elf2flt/elf2flt.ld b/package/elf2flt/src/elf2flt.ld
index cd4e652..cd4e652 100644
--- a/toolchain/elf2flt/elf2flt/elf2flt.ld
+++ b/package/elf2flt/src/elf2flt.ld
diff --git a/toolchain/elf2flt/elf2flt/flat.h b/package/elf2flt/src/flat.h
index 3cc502d..3cc502d 100644
--- a/toolchain/elf2flt/elf2flt/flat.h
+++ b/package/elf2flt/src/flat.h
diff --git a/toolchain/elf2flt/elf2flt/flthdr.c b/package/elf2flt/src/flthdr.c
index 967d640..967d640 100644
--- a/toolchain/elf2flt/elf2flt/flthdr.c
+++ b/package/elf2flt/src/flthdr.c
diff --git a/toolchain/elf2flt/elf2flt/install-sh b/package/elf2flt/src/install-sh
index 398a88e..398a88e 100755
--- a/toolchain/elf2flt/elf2flt/install-sh
+++ b/package/elf2flt/src/install-sh
diff --git a/toolchain/elf2flt/elf2flt/ld-elf2flt.in b/package/elf2flt/src/ld-elf2flt.in
index b876636..b876636 100644
--- a/toolchain/elf2flt/elf2flt/ld-elf2flt.in
+++ b/package/elf2flt/src/ld-elf2flt.in
diff --git a/toolchain/elf2flt/elf2flt/maketarball.sh b/package/elf2flt/src/maketarball.sh
index 1014860..1014860 100755
--- a/toolchain/elf2flt/elf2flt/maketarball.sh
+++ b/package/elf2flt/src/maketarball.sh
diff --git a/toolchain/elf2flt/elf2flt/stubs.c b/package/elf2flt/src/stubs.c
index fb14d63..fb14d63 100644
--- a/toolchain/elf2flt/elf2flt/stubs.c
+++ b/package/elf2flt/src/stubs.c
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
deleted file mode 100644
index 1462227..0000000
--- a/toolchain/elf2flt/elf2flt.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-################################################################################
-#
-# elf2flt
-#
-################################################################################
-
-# we keep a local checkout of uClinux CVS
-ELF2FLT_SOURCE:=$(ELF2FLT_DIR)/elf2flt
-ELF2FLT_DIR:=$(TOOLCHAIN_DIR)/elf2flt
-ELF2FLT_BINARY:=elf2flt
-
-$(ELF2FLT_DIR)/.unpacked:
- cp -r toolchain/elf2flt/elf2flt "$(TOOLCHAIN_DIR)/elf2flt"
- touch $@
-
-$(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
- $(call CONFIG_UPDATE,$(@D))
- touch $@
-
-$(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
- (cd $(ELF2FLT_DIR); rm -rf config.cache; \
- LDFLAGS="$(HOST_LDFLAGS) -lz" \
- $(ELF2FLT_DIR)/configure $(QUIET) \
- --with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
- --with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
- --target=$(GNU_TARGET_NAME) \
- --with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
- --with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
- --prefix=$(HOST_DIR)/usr)
- touch $@
-
-$(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured
- $(MAKE) -C $(ELF2FLT_DIR) all
- $(MAKE) -C $(ELF2FLT_DIR) install
-
-elf2flt: uclibc_target uclibc-configured binutils gcc host-zlib $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
-
-elf2flt-clean:
- rm -rf $(ELF2FLT_SOURCE)
-
-elf2flt-dirclean:
- rm -rf $(ELF2FLT_SOURCE)
-
-ifeq ($(BR2_ELF2FLT),y)
-TARGETS+=elf2flt
-endif
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index 5493177..5b89d56 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -1,6 +1,5 @@
# Include files required for the internal toolchain backend
-include toolchain/elf2flt/elf2flt.mk
include toolchain/gcc/gcc-uclibc-4.x.mk
include toolchain/kernel-headers/kernel-headers.mk
include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index f58a4f7..422602e 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -98,7 +98,7 @@ config BR2_PTHREAD_DEBUG
help
Build the thread library with debugging enabled.
-source "toolchain/elf2flt/Config.in"
+source "package/elf2flt/Config.in.host"
config BR2_VFP_FLOAT
bool "Use ARM Vector Floating Point unit"
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index d1e7552..4f9c29c 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -2,7 +2,6 @@
# Explicit ordering:
include toolchain/helpers.mk
-include toolchain/elf2flt/elf2flt.mk
include toolchain/gcc/gcc-uclibc-4.x.mk
include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index 9999aa2..2aa0141 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -1,7 +1,6 @@
# Required includes for the external toolchain backend
include toolchain/helpers.mk
-include toolchain/elf2flt/elf2flt.mk
include toolchain/gcc/gcc-uclibc-4.x.mk
include toolchain/kernel-headers/kernel-headers.mk
include toolchain/toolchain-external/ext-tool.mk