naoki: Fix toolchain builds.

diff --git a/pkgs/toolchain/acl/acl.nm b/pkgs/toolchain/acl/acl.nm
index 5804e2128ef97892afb8948159b8a7944e20d979..ee45dd63abbaf16b3ca7055610092d365089d612 100644 (file)
--- a/pkgs/toolchain/acl/acl.nm
+++ b/pkgs/toolchain/acl/acl.nm
@@ -1,5 +1,5 @@
 
-PKG_TOOLCHAIN_DEPS += attr
+PKG_TOOLCHAIN_DEPS += attr gcc glibc
 
 include ../../core/acl/acl.nm
 

diff --git a/pkgs/toolchain/attr/attr.nm b/pkgs/toolchain/attr/attr.nm
index ddb1aeac4321e48c737afdaacc243afe95dbb017..aa4a3ec1843c2ca02aff8d3d1ba9ab58c2cb550d 100644 (file)
--- a/pkgs/toolchain/attr/attr.nm
+++ b/pkgs/toolchain/attr/attr.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/attr/attr.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/autoconf/autoconf.nm b/pkgs/toolchain/autoconf/autoconf.nm
index ff72b1a4aaf89d349bc828af9649066f948fc86a..fb7167dc1d2767cfdc0e965c400d862dba68b91c 100644 (file)
--- a/pkgs/toolchain/autoconf/autoconf.nm
+++ b/pkgs/toolchain/autoconf/autoconf.nm
@@ -1,5 +1,5 @@
 
-PKG_TOOLCHAIN_DEPS += perl
+PKG_TOOLCHAIN_DEPS += gcc perl
 
 include ../../core/autoconf/autoconf.nm
 

diff --git a/pkgs/toolchain/automake/automake.nm b/pkgs/toolchain/automake/automake.nm
index 7bfea6032ea015642f1b55429c596a9cfe4271be..573025f440c9308f04788c537cb72d26dc8bf879 100644 (file)
--- a/pkgs/toolchain/automake/automake.nm
+++ b/pkgs/toolchain/automake/automake.nm
@@ -1,5 +1,5 @@
 
-PKG_TOOLCHAIN_DEPS += autoconf perl
+PKG_TOOLCHAIN_DEPS += autoconf gcc glibc perl
 
 include ../../core/automake/automake.nm
 

diff --git a/pkgs/toolchain/bash/bash.nm b/pkgs/toolchain/bash/bash.nm
index d73d2c466da05770cad80afb71ba6d4e2ced49a4..5bf6c1e13ce673861ecf3597c4b842730be17ec6 100644 (file)
--- a/pkgs/toolchain/bash/bash.nm
+++ b/pkgs/toolchain/bash/bash.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/bash/bash.nm
 
 PKG_PATCHES =

diff --git a/pkgs/toolchain/binutils/binutils.nm b/pkgs/toolchain/binutils/binutils.nm
index 83f84a0fec67b5f9499aa1a77a2391f77372de99..999cf2bc8776024eb262f4a61cb3dbdfec38e3fa 100644 (file)
--- a/pkgs/toolchain/binutils/binutils.nm
+++ b/pkgs/toolchain/binutils/binutils.nm
@@ -1,5 +1,5 @@
 
-PKG_TOOLCHAIN_DEPS += binutils-static glibc
+PKG_TOOLCHAIN_DEPS += binutils-static glibc zlib
 
 include ../binutils-static/binutils-static.nm
 

diff --git a/pkgs/toolchain/bzip2/bzip2.nm b/pkgs/toolchain/bzip2/bzip2.nm
index 436eebec860180f7560d0ec4cf0785e601ec8e69..ae8e70ac83c08c737842e8dde1c8d5ac768df50c 100644 (file)
--- a/pkgs/toolchain/bzip2/bzip2.nm
+++ b/pkgs/toolchain/bzip2/bzip2.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/bzip2/bzip2.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/coreutils/coreutils.nm b/pkgs/toolchain/coreutils/coreutils.nm
index a04009c4892fefde175122e0bfd389c04e8a1106..2145c14bdd7a19c2f7bb0f6a06c0873be9a40a8b 100644 (file)
--- a/pkgs/toolchain/coreutils/coreutils.nm
+++ b/pkgs/toolchain/coreutils/coreutils.nm
@@ -1,5 +1,5 @@
 
-PKG_TOOLCHAIN_DEPS += acl attr ncurses
+PKG_TOOLCHAIN_DEPS += acl attr gcc glibc ncurses
 
 include ../../core/coreutils/coreutils.nm
 

diff --git a/pkgs/toolchain/cpio/cpio.nm b/pkgs/toolchain/cpio/cpio.nm
index 35c798484d499bfe2385621f7a9aed9af266922d..df28cd807e3aa2ed30552b79d16659eace4a46f8 100644 (file)
--- a/pkgs/toolchain/cpio/cpio.nm
+++ b/pkgs/toolchain/cpio/cpio.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/cpio/cpio.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/diffutils/diffutils.nm b/pkgs/toolchain/diffutils/diffutils.nm
index 9678fd8696d893a5f4aebaa19553df8ac5800384..a988e1e8c780a0393dffec9ba2fb9e9d52c8ddca 100644 (file)
--- a/pkgs/toolchain/diffutils/diffutils.nm
+++ b/pkgs/toolchain/diffutils/diffutils.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/diffutils/diffutils.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/e2fsprogs/e2fsprogs.nm b/pkgs/toolchain/e2fsprogs/e2fsprogs.nm
index 4b7b57dba7c513881a2d70bacc6520dfc6d28f09..9e15a42b0c83dc786c501bc3a3a0dc05511500ea 100644 (file)
--- a/pkgs/toolchain/e2fsprogs/e2fsprogs.nm
+++ b/pkgs/toolchain/e2fsprogs/e2fsprogs.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/e2fsprogs/e2fsprogs.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/file/file.nm b/pkgs/toolchain/file/file.nm
index 8a88473c0bd5b96c9620e350d9337806e9c6a6b6..f6e7db6b9f7809279c8813bf6aa65d7bcadfc276 100644 (file)
--- a/pkgs/toolchain/file/file.nm
+++ b/pkgs/toolchain/file/file.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/file/file.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/findutils/findutils.nm b/pkgs/toolchain/findutils/findutils.nm
index da4d8b48086456d1f617e0e9d2da72fbf1692a62..e72d1493892eaf2cb0f9ff28e16236e631846fa9 100644 (file)
--- a/pkgs/toolchain/findutils/findutils.nm
+++ b/pkgs/toolchain/findutils/findutils.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/findutils/findutils.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/flex/flex.nm b/pkgs/toolchain/flex/flex.nm
index ac7f5ba9cca2292a2e082c88639c13fff49cef6b..c35cdc89ecd01eb75ca45dee6f5bb4e63161b2c2 100644 (file)
--- a/pkgs/toolchain/flex/flex.nm
+++ b/pkgs/toolchain/flex/flex.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/flex/flex.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/gawk/gawk.nm b/pkgs/toolchain/gawk/gawk.nm
index 960429eb2c2cd7717c50604bcaef2999af444092..a0fc3ef69709e14d271d37cc641bec7917f12e07 100644 (file)
--- a/pkgs/toolchain/gawk/gawk.nm
+++ b/pkgs/toolchain/gawk/gawk.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/gawk/gawk.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/gcc/gcc.nm b/pkgs/toolchain/gcc/gcc.nm
index a776a5ef3943646d36c0b878a124f35d808cca98..e160730e25205a8a2e794e8628fa67e2e9f557c1 100644 (file)
--- a/pkgs/toolchain/gcc/gcc.nm
+++ b/pkgs/toolchain/gcc/gcc.nm
@@ -4,15 +4,6 @@ PKG_TOOLCHAIN_DEPS += binutils glibc
 include ../gcc-static/gcc-static.nm
 
 define STAGE_BUILD
-       # Enable hardening by default:
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-espf-1.patch
-
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-branch-startfiles-1.patch
-
-       # This patch fixes a conflict between libiberty's asprintf() and Glibc's, when
-       # -D_FORTIFY_SOURCE=2 is used:
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/$(THISAPP)-asprintf_fix.patch
-
        cd $(DIR_APP) && sed 's@\./fixinc\.sh@-c true@' -i gcc/Makefile.in
        cd $(DIR_APP) && sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' -i gcc/Makefile.in
        cd $(DIR_APP) && \
@@ -24,13 +15,13 @@ define STAGE_BUILD
                        touch $$file.orig; \
                done
 
-ifeq "$(MACHINE)" "x86_64"
-       # Remove multilib options and searchpath (/lib... /usr/lib...)
-       cd $(DIR_APP) && echo "" > gcc/config/i386/t-linux64
-       ## Enable -fPIC by default (why i have to do this again ???)
-       cd $(DIR_APP) && sed 's/^\(#define CC1_SPEC.*\)\("\)$$/\1 %{fno-pic|fpic|fPIC:;:-fPIC}\2/' \
-               -i gcc/config/i386/x86-64.h
-endif
+#ifeq "$(MACHINE)" "x86_64"
+#      # Remove multilib options and searchpath (/lib... /usr/lib...)
+#      cd $(DIR_APP) && echo "" > gcc/config/i386/t-linux64
+#      ## Enable -fPIC by default (why i have to do this again ???)
+#      cd $(DIR_APP) && sed 's/^\(#define CC1_SPEC.*\)\("\)$$/\1 %{fno-pic|fpic|fPIC:;:-fPIC}\2/' \
+#              -i gcc/config/i386/x86-64.h
+#endif
 
        # We need to do another bootstrap, so that everything in $(TOOLS_DIR) is hardened.
        cd $(DIR_SRC)/gcc-build && \

diff --git a/pkgs/toolchain/gettext/gettext.nm b/pkgs/toolchain/gettext/gettext.nm
index 2135e1b1d74b1ec1f9d32a4b999c9e588f292a75..5470796b70a02680df290484e4a231429181dbb6 100644 (file)
--- a/pkgs/toolchain/gettext/gettext.nm
+++ b/pkgs/toolchain/gettext/gettext.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/gettext/gettext.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/grep/grep.nm b/pkgs/toolchain/grep/grep.nm
index 5a4393d9153bb816d0de50b9c2679cb5bec5ee85..cbc117e72a29a96083907ff0bd4a4eeb745e25e0 100644 (file)
--- a/pkgs/toolchain/grep/grep.nm
+++ b/pkgs/toolchain/grep/grep.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/grep/grep.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/gzip/gzip.nm b/pkgs/toolchain/gzip/gzip.nm
index abcf7a13be162f4e5425b0fa7d8f7cbd6ae8fe2a..93ef9ac9e3d91e427d740b1b1fd7886bea5d0d9c 100644 (file)
--- a/pkgs/toolchain/gzip/gzip.nm
+++ b/pkgs/toolchain/gzip/gzip.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/gzip/gzip.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/kernel-headers/kernel-headers.nm b/pkgs/toolchain/kernel-headers/kernel-headers.nm
index dd8cc9e21b510d1b85cbe9c4af00cc09f953bfcf..191f38a17d00518ba6463defdf7174806bce1e05 100644 (file)
--- a/pkgs/toolchain/kernel-headers/kernel-headers.nm
+++ b/pkgs/toolchain/kernel-headers/kernel-headers.nm
@@ -1,9 +1,10 @@
 
-PKG_TOOLCHAIN_DEPS = # Depend on nothing
+PKG_TOOLCHAIN_DEPS = # Depends on nothing
 
 include ../../core/kernel-headers/kernel-headers.nm
 
 define STAGE_INSTALL
        cd $(DIR_APP) && make ARCH=x86 INSTALL_HDR_PATH=dest headers_install
+       -mkdir -pv $(TOOLS_DIR)/include
        cd $(DIR_APP) && cp -rv dest/include/* $(TOOLS_DIR)/include
 endef

diff --git a/pkgs/toolchain/m4/m4.nm b/pkgs/toolchain/m4/m4.nm
index df66dcc9461bd13449666cb3c0ede727cb192e6b..602a9c0a18189af1cd07862bece933800acc22ca 100644 (file)
--- a/pkgs/toolchain/m4/m4.nm
+++ b/pkgs/toolchain/m4/m4.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/m4/m4.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/make/make.nm b/pkgs/toolchain/make/make.nm
index bc8aec5b722edde82872f9b0a0bdd262d16c0a33..16551bad2e480ec274e96f3b30d757b2010db77b 100644 (file)
--- a/pkgs/toolchain/make/make.nm
+++ b/pkgs/toolchain/make/make.nm
@@ -1,7 +1,9 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/make/make.nm
 
-define STAGE_INSTALL
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \

diff --git a/pkgs/toolchain/ncurses/ncurses.nm b/pkgs/toolchain/ncurses/ncurses.nm
index 1bb2daf68e53c6322462d984cbc3e8f9dcfe228e..a84a008d7223f9f4a4712349375242258c90a41f 100644 (file)
--- a/pkgs/toolchain/ncurses/ncurses.nm
+++ b/pkgs/toolchain/ncurses/ncurses.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/ncurses/ncurses.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/patch/patch.nm b/pkgs/toolchain/patch/patch.nm
index 8b1a16a631f4f73972ba0f48a8271ea6e703ca2c..e406c53b520e03ea3561121dd8c985b7335f95af 100644 (file)
--- a/pkgs/toolchain/patch/patch.nm
+++ b/pkgs/toolchain/patch/patch.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/patch/patch.nm
 
 define STAGE_BUILD
@@ -9,3 +11,7 @@ define STAGE_BUILD
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 endef
+
+define STAGE_INSTALL
+       cd $(DIR_APP) && make install
+endef

diff --git a/pkgs/toolchain/pax-utils/pax-utils.nm b/pkgs/toolchain/pax-utils/pax-utils.nm
index d46190a8e08fc754ce08c5965a9888d762f7ffe1..19145b71f3f0b4edfc9e6993f9027bea09dd4441 100644 (file)
--- a/pkgs/toolchain/pax-utils/pax-utils.nm
+++ b/pkgs/toolchain/pax-utils/pax-utils.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/pax-utils/pax-utils.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/perl/perl.nm b/pkgs/toolchain/perl/perl.nm
index 807d45e5b1ed5432d938abdc5f13d35e59a10e61..49d89b169b7f47d5c4d8e16b09b1a5698828dd7e 100644 (file)
--- a/pkgs/toolchain/perl/perl.nm
+++ b/pkgs/toolchain/perl/perl.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/perl/perl.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/sed/sed.nm b/pkgs/toolchain/sed/sed.nm
index e21e25fe3845773b19174e14b1f68a43e71e1976..fc57b5a1e0854b800fffcc00e993121a7ce82ffc 100644 (file)
--- a/pkgs/toolchain/sed/sed.nm
+++ b/pkgs/toolchain/sed/sed.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/sed/sed.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/tar/tar.nm b/pkgs/toolchain/tar/tar.nm
index cb56f76e88cc0ff50f1c25b90889b4caf106d984..99cdc998baf9f0488c03bd33a51917c8891224a6 100644 (file)
--- a/pkgs/toolchain/tar/tar.nm
+++ b/pkgs/toolchain/tar/tar.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/tar/tar.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/texinfo/texinfo.nm b/pkgs/toolchain/texinfo/texinfo.nm
index 52efdeea48f789660b0c29cf66becc616b5901da..675a6419cd39a4ab50410a65739b5da0d6ef8617 100644 (file)
--- a/pkgs/toolchain/texinfo/texinfo.nm
+++ b/pkgs/toolchain/texinfo/texinfo.nm
@@ -1,5 +1,5 @@
 
-PKG_TOOLCHAIN_DEPS += $(TC_PACKAGES) ncurses
+PKG_TOOLCHAIN_DEPS += gcc glibc ncurses
 
 include ../../core/texinfo/texinfo.nm
 

diff --git a/pkgs/toolchain/xz/xz.nm b/pkgs/toolchain/xz/xz.nm
index e28024d6270b7378111d63925a74d5a6422ee18c..68cac4ea50d719ff4e4d0ecdb3cf838cc00ee0ea 100644 (file)
--- a/pkgs/toolchain/xz/xz.nm
+++ b/pkgs/toolchain/xz/xz.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += gcc glibc
+
 include ../../core/xz/xz.nm
 
 define STAGE_BUILD

diff --git a/pkgs/toolchain/zlib/zlib.nm b/pkgs/toolchain/zlib/zlib.nm
index ae72672d9515a3aa63350cfd21ec9bcb75157348..fb347fceb1b87209db33b98aeb2c2db7e6ee1894 100644 (file)
--- a/pkgs/toolchain/zlib/zlib.nm
+++ b/pkgs/toolchain/zlib/zlib.nm
@@ -1,4 +1,6 @@
 
+PKG_TOOLCHAIN_DEPS += glibc
+
 include ../../core/zlib/zlib.nm
 
 define STAGE_BUILD
@@ -14,6 +16,6 @@ define STAGE_BUILD
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 endef
 
-define STAGE_BUILD
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
 endef