From: Michael Tremer Date: Sun, 22 Nov 2009 17:16:40 +0000 (+0100) Subject: naoki: Fix toolchain builds. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cfc2057ab276a23e1fcc79c9ed89952e6cea5d0;p=ipfire-3.x.git naoki: Fix toolchain builds. --- diff --git a/pkgs/toolchain/acl/acl.nm b/pkgs/toolchain/acl/acl.nm index 5804e2128..ee45dd63a 100644 --- 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 ddb1aeac4..aa4a3ec18 100644 --- 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 ff72b1a4a..fb7167dc1 100644 --- 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 7bfea6032..573025f44 100644 --- 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 d73d2c466..5bf6c1e13 100644 --- 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 83f84a0fe..999cf2bc8 100644 --- 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 436eebec8..ae8e70ac8 100644 --- 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 a04009c48..2145c14bd 100644 --- 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 35c798484..df28cd807 100644 --- 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 9678fd869..a988e1e8c 100644 --- 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 4b7b57dba..9e15a42b0 100644 --- 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 8a88473c0..f6e7db6b9 100644 --- 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 da4d8b480..e72d14938 100644 --- 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 ac7f5ba9c..c35cdc89e 100644 --- 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 960429eb2..a0fc3ef69 100644 --- 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 a776a5ef3..e160730e2 100644 --- 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 2135e1b1d..5470796b7 100644 --- 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 5a4393d91..cbc117e72 100644 --- 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 abcf7a13b..93ef9ac9e 100644 --- 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 dd8cc9e21..191f38a17 100644 --- 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 df66dcc94..602a9c0a1 100644 --- 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 bc8aec5b7..16551bad2 100644 --- 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 1bb2daf68..a84a008d7 100644 --- 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 8b1a16a63..e406c53b5 100644 --- 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 d46190a8e..19145b71f 100644 --- 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 807d45e5b..49d89b169 100644 --- 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 e21e25fe3..fc57b5a1e 100644 --- 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 cb56f76e8..99cdc998b 100644 --- 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 52efdeea4..675a6419c 100644 --- 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 e28024d62..68cac4ea5 100644 --- 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 ae72672d9..fb347fceb 100644 --- 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