diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | mingw-w64-build | 108 |
2 files changed, 87 insertions, 24 deletions
@@ -1,3 +1,6 @@ +# mingw-w64-build-ng +[Zeranoe](https://github.com/Zeranoe/mingw-w64-build)s build script with some extensioons rejected by the upstream. + # mingw-w64-build mingw-w64-build is a Bash script to build a [MinGW-w64](https://mingw-w64.org) cross compiler for i686 (Win32) and x86_64 (Win64). It will build a fully static diff --git a/mingw-w64-build b/mingw-w64-build index cc0f6f5..a09139b 100755 --- a/mingw-w64-build +++ b/mingw-w64-build @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2022 Kyle Schwarz <zeranoe@gmail.com> +# Copyright (C) 2022 Kyle Schwarz <zeranoe@gmail.com>, Toni Uhlig <matzeton@googlemail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,12 +16,22 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -ROOT_PATH="$HOME/.zeranoe/mingw-w64" +ROOT_PATH="$HOME/.mingw-w64-build-ng" MINGW_W64_BRANCH="v9.x" BINUTILS_BRANCH="binutils-2_39-branch" GCC_BRANCH="releases/gcc-12" +USE_TARBALL_RELEASES=1 + +MINGW_W64_TARBALL_VERSION="v9.0.0" +BINUTILS_TARBALL_VERSION="2.37" +GCC_TARBALL_VERSION="11.2.0" + +MINGW_W64_TARBALL_SHA512="e5726eff24326dd8997c21e0ea3069fc6b8e2b29ba40648f7c0c8b52980d02b96b13d8c00dfa91b16fcd311d1fb83ec879cf2ce57249b7f5069e4af7b93b872a" +BINUTILS_TARBALL_SHA512="344968dd0b49eb54e3c67f9e36c7164d78a24bd4274b7656f71de9cf3fe5cff8278c43a35655f74d85ee76b469639fdcb39d9764b489450887b7529df0a3a730" +GCC_TARBALL_SHA512="155535da34c74467e5d041fc6a79f5f102c30a7808b929a880dc33baae48e706089c8db20b2e30d49f4857c4a65f4e8e8f5a9d121d53facfeb5758d316c76c4d" + ENABLE_THREADS="--enable-threads=posix" JOB_COUNT=$(($(getconf _NPROCESSORS_ONLN) + 2)) @@ -46,9 +56,10 @@ Options: --keep-artifacts don't remove source and build files after a successful build --disable-threads disable pthreads and STL <thread> --cached-sources use existing sources instead of downloading new ones - --binutils-branch <branch> set Binutils branch (default: $BINUTILS_BRANCH) - --gcc-branch <branch> set GCC branch (default: $GCC_BRANCH) - --mingw-w64-branch <branch> set MinGW-w64 branch (default: $MINGW_W64_BRANCH) + --binutils-branch <branch> NOT RECOMMENDED - set Binutils branch (default: $BINUTILS_BRANCH) + --gcc-branch <branch> NOT RECOMMENDED - set GCC branch (default: $GCC_BRANCH) + --mingw-w64-branch <branch> NOT RECOMMENDED - set MinGW-w64 branch (default: $MINGW_W64_BRANCH) + --force-git NOT RECOMMENDED - force git clone (default: disabled) --linked-runtime <runtime> set MinGW Linked Runtime (default: $LINKED_RUNTIME) EOF } @@ -124,21 +135,59 @@ download_sources() create_dir "$SRC_PATH" change_dir "$SRC_PATH" - execute "downloading MinGW-w64 source" "" \ - git clone --depth 1 -b "$MINGW_W64_BRANCH" \ - https://git.code.sf.net/p/mingw-w64/mingw-w64 mingw-w64 + if [ ${USE_TARBALL_RELEASES} -eq 0 ]; then + execute "downloading MinGW-w64 source (GIT+HTTPS)" "" \ + git clone --depth 1 -b "$MINGW_W64_BRANCH" \ + "https://git.code.sf.net/p/mingw-w64/mingw-w64" mingw-w64 + else + execute "downloading MinGW-w64 source (TAR+HTTPS)" "" \ + curl -o mingw-w64.tar.gz \ + "https://codeload.github.com/mirror/mingw-w64/tar.gz/refs/tags/${MINGW_W64_TARBALL_VERSION}" + + MINGW_W64_sha512sum="$(sha512sum mingw-w64.tar.gz | cut -d ' ' -f 1)" + execute "verify MinGW-w64 SHA-512" \ + "Hash verification failed; new: ${MINGW_W64_sha512sum}" \ + test "${MINGW_W64_sha512sum}" = "${MINGW_W64_TARBALL_SHA512}" + + execute "extract MinGW-w64 tarball" "" \ + tar -xzf mingw-w64.tar.gz --one-top-level=mingw-w64/ --strip-components=1 + fi + + if [ ${USE_TARBALL_RELEASES} -eq 0 ]; then + execute "downloading Binutils source (GIT+HTTPS)" "" \ + git clone --depth 1 -b "$BINUTILS_BRANCH" \ + "https://sourceware.org/git/binutils-gdb.git" binutils + else + execute "downloading Binutils source (TAR+HTTPS)" "" \ + curl -o binutils.tar.gz \ + "https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_TARBALL_VERSION}.tar.gz" + + BINUTILS_sha512sum="$(sha512sum binutils.tar.gz | cut -d ' ' -f 1)" + execute "verify Binutils SHA-512" \ + "Hash verification failed; new: ${BINUTILS_sha512sum}" \ + test "${BINUTILS_sha512sum}" = "${BINUTILS_TARBALL_SHA512}" - execute "downloading Binutils source" "" \ - git clone --depth 1 -b "$BINUTILS_BRANCH" \ - https://sourceware.org/git/binutils-gdb.git binutils + execute "extract Binutils tarball" "" \ + tar -xzf binutils.tar.gz --one-top-level=binutils/ --strip-components=1 + fi - execute "downloading GCC source" "" \ - git clone --depth 1 -b "$GCC_BRANCH" \ - https://gcc.gnu.org/git/gcc.git gcc + if [ ${USE_TARBALL_RELEASES} -eq 0 ]; then + execute "downloading GCC source (GIT+HTTPS)" "" \ + git clone --depth 1 -b "$GCC_BRANCH" \ + "https://gcc.gnu.org/git/gcc.git" gcc + else + execute "downloading GCC source (TAR+HTTPS)" "" \ + curl -o gcc.tar.gz \ + "https://codeload.github.com/gcc-mirror/gcc/tar.gz/refs/tags/releases/gcc-${GCC_TARBALL_VERSION}" - execute "downloading config.guess" "" \ - curl -o config.guess \ - "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" + GCC_sha512sum="$(sha512sum gcc.tar.gz | cut -d ' ' -f 1)" + execute "verify GCC SHA-512" \ + "Hash verification failed; new: ${GCC_sha512sum}" \ + test "${GCC_sha512sum}" = "${GCC_TARBALL_SHA512}" + + execute "extract GCC tarball" "" \ + tar -xzf gcc.tar.gz --one-top-level=gcc/ --strip-components=1 + fi } build() @@ -258,14 +307,14 @@ while :; do ;; -p|--prefix) if [ "$2" ]; then - PREFIX="$2" + PREFIX=$(realpath "$2") shift else arg_error "'--prefix' requires a non-empty option argument" fi ;; --prefix=?*) - PREFIX=${1#*=} + PREFIX=$(realpath "${1#*=}") ;; --prefix=) arg_error "'--prefix' requires a non-empty option argument" @@ -294,6 +343,7 @@ while :; do CACHED_SOURCES=1 ;; --binutils-branch) + USE_TARBALL_RELEASES=0 if [ "$2" ]; then BINUTILS_BRANCH="$2" shift @@ -302,12 +352,14 @@ while :; do fi ;; --binutils-branch=?*) + USE_TARBALL_RELEASES=0 BINUTILS_BRANCH=${1#*=} ;; --binutils-branch=) arg_error "'--binutils-branch' requires a non-empty option argument" ;; --gcc-branch) + USE_TARBALL_RELEASES=0 if [ "$2" ]; then GCC_BRANCH="$2" shift @@ -316,6 +368,7 @@ while :; do fi ;; --gcc-branch=?*) + USE_TARBALL_RELEASES=0 GCC_BRANCH=${1#*=} ;; --gcc-branch=) @@ -336,6 +389,7 @@ while :; do arg_error "'--linked-runtime' requires a non-empty option argument" ;; --mingw-w64-branch) + USE_TARBALL_RELEASES=0 if [ "$2" ]; then MINGW_W64_BRANCH="$2" shift @@ -344,11 +398,15 @@ while :; do fi ;; --mingw-w64-branch=?*) + USE_TARBALL_RELEASES=0 MINGW_W64_BRANCH=${1#*=} ;; --mingw-w64-branch=) arg_error "'--mingw-w64-branch' requires a non-empty option argument" ;; + --force-git) + USE_TARBALL_RELEASES=0 + ;; i686) BUILD_I686=1 ;; @@ -383,7 +441,7 @@ if [ ! "$BUILD_I686" ] && [ ! "$BUILD_X86_64" ]; then fi MISSING_EXECS="" -for exec in g++ flex bison git makeinfo m4 bzip2 curl make diff; do +for exec in g++ flex bison git makeinfo m4 bzip2 curl make diff sha512sum cut test; do if ! command -v "$exec" >/dev/null; then MISSING_EXECS="$MISSING_EXECS $exec" fi @@ -392,10 +450,14 @@ if [ "$MISSING_EXECS" ]; then error_exit "missing required executable(s):$MISSING_EXECS" fi -TOTAL_STEPS=0 +TOTAL_STEPS=1 + +if [ "${USE_TARBALL_RELEASES}" -ne 0 ]; then + TOTAL_STEPS=$((TOTAL_STEPS + 6)) +fi if [ "$CACHED_SOURCES" ]; then - if [ ! -f "$SRC_PATH/config.guess" ]; then + if [ ! -f "$SRC_PATH/mingw-w64.tar.gz" ]; then arg_error "no sources found, run with --keep-artifacts first" fi else @@ -433,8 +495,6 @@ if [ ! "$CACHED_SOURCES" ]; then download_sources fi -BUILD=$(sh "$SRC_PATH/config.guess") - change_dir "$SRC_PATH/gcc" execute "" "failed to download GCC dependencies" \ |