From 616ca90999f3429ecc77b33e7c87603ec025eb4e Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 19 Jun 2017 12:46:53 +0000 Subject: Correct 'track' field for stage2-fhs-dirs --- elements/gnu-toolchain/stage2-fhs-dirs.bst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'elements') diff --git a/elements/gnu-toolchain/stage2-fhs-dirs.bst b/elements/gnu-toolchain/stage2-fhs-dirs.bst index 37346231..f91f2f1f 100644 --- a/elements/gnu-toolchain/stage2-fhs-dirs.bst +++ b/elements/gnu-toolchain/stage2-fhs-dirs.bst @@ -3,7 +3,7 @@ kind: manual sources: - kind: git url: baserock:baserock/fhs-dirs - track: master + track: baserock/usr_merge ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5 depends: -- cgit v1.2.1 From aaefeb1e22579deef6a7829d055eee70c8a7a4f0 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 20 Jun 2017 08:58:28 +0000 Subject: Update GCC to 7.1.0, and GLIBC to 2.25 --- elements/gnu-toolchain/gcc.bst | 4 ++-- elements/gnu-toolchain/glibc.bst | 4 ++-- elements/gnu-toolchain/stage1-gcc.bst | 5 +++-- elements/gnu-toolchain/stage2-gcc-fixed-headers.bst | 4 ++-- elements/gnu-toolchain/stage2-gcc.bst | 4 ++-- elements/gnu-toolchain/stage2-glibc.bst | 4 ++-- elements/gnu-toolchain/stage2-libstdcxx.bst | 6 +++--- 7 files changed, 16 insertions(+), 15 deletions(-) (limited to 'elements') diff --git a/elements/gnu-toolchain/gcc.bst b/elements/gnu-toolchain/gcc.bst index b7b17ae6..5815cf01 100644 --- a/elements/gnu-toolchain/gcc.bst +++ b/elements/gnu-toolchain/gcc.bst @@ -3,8 +3,8 @@ kind: manual sources: - kind: git url: upstream:gcc-tarball - track: baserock/gnu-toolchain - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 + track: baserock/gcc-7.1.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 depends: - filename: gnu-toolchain/stage2.bst diff --git a/elements/gnu-toolchain/glibc.bst b/elements/gnu-toolchain/glibc.bst index 8621074e..48e9262e 100644 --- a/elements/gnu-toolchain/glibc.bst +++ b/elements/gnu-toolchain/glibc.bst @@ -3,8 +3,8 @@ kind: manual sources: - kind: git url: upstream:glibc - track: release/2.22/master - ref: b995d95a5943785be3ab862b2d3276f3b4a22481 + track: release/2.25/master + ref: adc7e06fb412a2a1ee52f8cb788caf436335b9f3 depends: - filename: gnu-toolchain/stage2.bst diff --git a/elements/gnu-toolchain/stage1-gcc.bst b/elements/gnu-toolchain/stage1-gcc.bst index 17851848..8e9eadfd 100644 --- a/elements/gnu-toolchain/stage1-gcc.bst +++ b/elements/gnu-toolchain/stage1-gcc.bst @@ -3,8 +3,8 @@ kind: autotools sources: - kind: git url: upstream:gcc-tarball - track: baserock/gnu-toolchain - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 + track: baserock/gcc-7.1.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 depends: - gnu-toolchain/base-platform.bst @@ -72,6 +72,7 @@ config: `# [5]` --disable-libatomic \ `# [5]` --disable-libgomp \ `# [5]` --disable-libitm \ + `# [5]` --disable-libmpx \ `# [5]` --disable-libquadmath \ `# [5]` --disable-libsanitizer \ `# [5]` --disable-libssp \ diff --git a/elements/gnu-toolchain/stage2-gcc-fixed-headers.bst b/elements/gnu-toolchain/stage2-gcc-fixed-headers.bst index f3ed0e1e..80c9bf32 100644 --- a/elements/gnu-toolchain/stage2-gcc-fixed-headers.bst +++ b/elements/gnu-toolchain/stage2-gcc-fixed-headers.bst @@ -3,8 +3,8 @@ kind: manual sources: - kind: git url: upstream:gcc-tarball - track: baserock/gnu-toolchain - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 + track: baserock/gcc-7.1.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 depends: - filename: gnu-toolchain/stage1.bst diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst index 18594d8f..2f13723a 100644 --- a/elements/gnu-toolchain/stage2-gcc.bst +++ b/elements/gnu-toolchain/stage2-gcc.bst @@ -3,8 +3,8 @@ kind: manual sources: - kind: git url: upstream:gcc-tarball - track: baserock/gnu-toolchain - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 + track: baserock/gcc-7.1.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 depends: - filename: gnu-toolchain/stage1.bst diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst index 1c3745e1..63740088 100644 --- a/elements/gnu-toolchain/stage2-glibc.bst +++ b/elements/gnu-toolchain/stage2-glibc.bst @@ -3,8 +3,8 @@ kind: manual sources: - kind: git url: upstream:glibc - track: release/2.22/master - ref: b995d95a5943785be3ab862b2d3276f3b4a22481 + track: release/2.25/master + ref: 49f97e641e4e84a42246655d30adbc4756e67114 depends: - filename: gnu-toolchain/stage1.bst diff --git a/elements/gnu-toolchain/stage2-libstdcxx.bst b/elements/gnu-toolchain/stage2-libstdcxx.bst index db6f8a62..12ea73fa 100644 --- a/elements/gnu-toolchain/stage2-libstdcxx.bst +++ b/elements/gnu-toolchain/stage2-libstdcxx.bst @@ -3,8 +3,8 @@ kind: manual sources: - kind: git url: upstream:gcc-tarball - track: baserock/gnu-toolchain - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 + track: baserock/gcc-7.1.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 depends: - filename: gnu-toolchain/stage1.bst @@ -46,7 +46,7 @@ config: --disable-multilib \ `# [1]` --disable-libstdcxx-threads \ `# [2]` --disable-libstdcxx-pch \ - `# [3]` --with-gxx-include-dir=/tools/%{target-stage1}/include/c++/4.9.2 + `# [3]` --with-gxx-include-dir=/tools/%{target-stage1}/include/c++/7.1.0 build-commands: - cd o && make -- cgit v1.2.1 From 23a3a3c746261c3ecb2aa961d91f988f0602a032 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 14 Jun 2017 22:58:52 +0100 Subject: Support cross-building the stage1 and stage2 components This requires a feature recently added to BuildStream (in commit 03906221) that adds a framework for elements to support being cross-compiled. To build an armv8l64 native toolchain and sysroot on an x86_64 build machine, for example, you can do this: bst build --target-arch=armv8l64 gnu-toolchain/stage2.bst You can then run `bst checkout` to get at the resulting binaries and copy them onto an armv8l64 machine where they can be executed. --- elements/gnu-toolchain/base-platform.bst | 2 +- elements/gnu-toolchain/base-sdk.bst | 2 +- elements/gnu-toolchain/gcc.bst | 4 ++-- elements/gnu-toolchain/linux-api-headers.bst | 4 ++-- elements/gnu-toolchain/stage1-gcc.bst | 4 ++-- elements/gnu-toolchain/stage2-gcc.bst | 4 ++-- elements/gnu-toolchain/stage2-glibc.bst | 6 +++--- elements/gnu-toolchain/stage2-linux-api-headers.bst | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'elements') diff --git a/elements/gnu-toolchain/base-platform.bst b/elements/gnu-toolchain/base-platform.bst index 09c95acb..ce9cdc0a 100644 --- a/elements/gnu-toolchain/base-platform.bst +++ b/elements/gnu-toolchain/base-platform.bst @@ -6,7 +6,7 @@ public: bst: integration-commands: - ldconfig -arches: +host-arches: x86_64: sources: - kind: ostree diff --git a/elements/gnu-toolchain/base-sdk.bst b/elements/gnu-toolchain/base-sdk.bst index cd191fd1..61c29f64 100644 --- a/elements/gnu-toolchain/base-sdk.bst +++ b/elements/gnu-toolchain/base-sdk.bst @@ -3,7 +3,7 @@ description: Import the base freedesktop SDK config: source: files target: usr -arches: +host-arches: x86_64: sources: - kind: ostree diff --git a/elements/gnu-toolchain/gcc.bst b/elements/gnu-toolchain/gcc.bst index 5815cf01..e9a54834 100644 --- a/elements/gnu-toolchain/gcc.bst +++ b/elements/gnu-toolchain/gcc.bst @@ -30,7 +30,7 @@ config: # 2. Avoid having more than one copy of ZLib in use on the system # 3. Multilib does not make sense in Baserock. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ @@ -50,7 +50,7 @@ config: build-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5*) sed -i "s/--host=none/--host=armv5/" o/Makefile sed -i "s/--target=none/--target=armv5/" o/Makefile ;; armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile diff --git a/elements/gnu-toolchain/linux-api-headers.bst b/elements/gnu-toolchain/linux-api-headers.bst index 0020d2ae..db89f18d 100644 --- a/elements/gnu-toolchain/linux-api-headers.bst +++ b/elements/gnu-toolchain/linux-api-headers.bst @@ -17,7 +17,7 @@ environment: config: install-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5l) ARCH="arm" ;; armv7b|armv7l|armv7lhf) @@ -31,7 +31,7 @@ config: ppc64) ARCH="powerpc" ;; *) - echo "Error: unsupported Morph architecture: %{bst-arch}" >&2 + echo "Error: unsupported architecture: %{bst-target-arch}" >&2 exit 1 esac ARCH=$ARCH make INSTALL_HDR_PATH=dest headers_install diff --git a/elements/gnu-toolchain/stage1-gcc.bst b/elements/gnu-toolchain/stage1-gcc.bst index 8e9eadfd..bcf30bc3 100644 --- a/elements/gnu-toolchain/stage1-gcc.bst +++ b/elements/gnu-toolchain/stage1-gcc.bst @@ -43,7 +43,7 @@ config: # without an existing libc, and generally try to keep this build as # simple as possible. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ @@ -89,7 +89,7 @@ config: # code results on an undefined reference to `__gmpn_invert_limb' in # ARMv7. Fix the invocation of GMP's configure script so that GMP can # use the machine-dependent code. - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5*) sed -i "s/--host=none/--host=armv5/" o/Makefile sed -i "s/--target=none/--target=armv5/" o/Makefile ;; armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst index 2f13723a..beaff58f 100644 --- a/elements/gnu-toolchain/stage2-gcc.bst +++ b/elements/gnu-toolchain/stage2-gcc.bst @@ -40,7 +40,7 @@ config: # 4. This flag causes the correct --sysroot flag to be passed when # calling stage 1 GCC. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ @@ -71,7 +71,7 @@ config: build-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5*) sed -i "s/--host=none/--host=armv5/" o/Makefile sed -i "s/--target=none/--target=armv5/" o/Makefile ;; armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst index 63740088..a5153c5b 100644 --- a/elements/gnu-toolchain/stage2-glibc.bst +++ b/elements/gnu-toolchain/stage2-glibc.bst @@ -31,7 +31,7 @@ config: # 4. Force configuration values of certain things that can't be detected # in a cross-compile. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7*) ARCH_FLAGS="--without-fp" ;; esac @@ -105,12 +105,12 @@ config: # sysdeps/unix/sysv/linux/configure. - install -d %{install-root}/lib - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in x86_64) install -d "%{install-root}/lib64" ln -s "%{prefix}/lib/ld-linux-x86-64.so.2" \ "%{install-root}/lib64/ld-linux-x86-64.so.2" ;; - ppc64) + ppc64l|ppc64b) install -d "%{install-root}/lib64" ln -s "%{prefix}/lib/ld64.so.1" \ "%{install-root}/lib64/ld64.so.1" ;; diff --git a/elements/gnu-toolchain/stage2-linux-api-headers.bst b/elements/gnu-toolchain/stage2-linux-api-headers.bst index e5869bf1..10ec224a 100644 --- a/elements/gnu-toolchain/stage2-linux-api-headers.bst +++ b/elements/gnu-toolchain/stage2-linux-api-headers.bst @@ -19,7 +19,7 @@ environment: config: install-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5l) ARCH="arm" ;; armv7b|armv7l|armv7lhf) @@ -30,10 +30,10 @@ config: ARCH="i386" ;; x86_64) ARCH="x86_64" ;; - ppc64) + ppc64b|ppc64l) ARCH="powerpc" ;; *) - echo "Error: unsupported Morph architecture: %{bst-arch}" >&2 + echo "Error: unsupported architecture: %{bst-target-arch}" >&2 exit 1 esac ARCH=$ARCH make INSTALL_HDR_PATH=dest headers_install -- cgit v1.2.1 From 28dba2a2843bf6d5c16256a8e4df47ce18ec48f1 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 19 Jun 2017 12:43:09 +0000 Subject: Proper support for powerpc64 (little and big endian) --- elements/gnu-toolchain/stage2-glibc.bst | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'elements') diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst index a5153c5b..043dccb4 100644 --- a/elements/gnu-toolchain/stage2-glibc.bst +++ b/elements/gnu-toolchain/stage2-glibc.bst @@ -100,9 +100,11 @@ config: # Install a symlink for the program interpreter (ld.so) so that binaries # built in stage 3 before the stage 3 glibc is built can use it. - # FIXME: get a better way of finding the name of the loader. The lib64 - # path is hardcoded into glibc in the file - # sysdeps/unix/sysv/linux/configure. + # + # The name of the dynamic loader is hardcoded in GCC during its 'configure' + # stage, but the file is actually provided by the libc (usually GLIBC). It + # would be better if we could ask GCC or GLIBC what the expected name of the + # ld.so is for the given platform rather than figuring it out - install -d %{install-root}/lib - | case "%{bst-target-arch}" in @@ -110,7 +112,11 @@ config: install -d "%{install-root}/lib64" ln -s "%{prefix}/lib/ld-linux-x86-64.so.2" \ "%{install-root}/lib64/ld-linux-x86-64.so.2" ;; - ppc64l|ppc64b) + ppc64l) + install -d "%{install-root}/lib64" + ln -s "%{prefix}/lib/ld64.so.2" \ + "%{install-root}/lib64/ld64.so.2" ;; + ppc64b) install -d "%{install-root}/lib64" ln -s "%{prefix}/lib/ld64.so.1" \ "%{install-root}/lib64/ld64.so.1" ;; -- cgit v1.2.1