From 5f3fc93780c332305fd85689bffa5568146ff19c Mon Sep 17 00:00:00 2001 From: Malcolm MacLeod Date: Fri, 20 Aug 2021 12:21:36 +0000 Subject: [PATCH] Official build: v2.4.6 --- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux-electron.yml | 6 +++--- contrib/gitian-descriptors/gitian-linux.yml | 4 ++-- contrib/gitian-descriptors/gitian-osx-electron.yml | 6 +++--- contrib/gitian-descriptors/gitian-osx.yml | 4 ++-- contrib/gitian-descriptors/gitian-win-electron.yml | 6 +++--- contrib/gitian-descriptors/gitian-win.yml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index ec43eed732..f626878f78 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 4) define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 6) -define(_CLIENT_VERSION_IS_RELEASE, false) +define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Gulden]]) diff --git a/contrib/gitian-descriptors/gitian-linux-electron.yml b/contrib/gitian-descriptors/gitian-linux-electron.yml index ff9b687b54..686f299070 100644 --- a/contrib/gitian-descriptors/gitian-linux-electron.yml +++ b/contrib/gitian-descriptors/gitian-linux-electron.yml @@ -45,11 +45,11 @@ script: | WRAP_DIR=$HOME/wrapped HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" - CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-man --enable-zmq --with-utils --with-daemon --with-node-js-libs --with-qrencode --with-gui=no" + CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-tests --disable-man --enable-zmq --with-utils --with-daemon --with-node-js-libs --with-qrencode --with-gui=no" FAKETIME_HOST_PROGS="gcc g++" FAKETIME_PROGS="date ar ranlib nm" - HOST_CFLAGS="-O2 -g" - HOST_CXXFLAGS="-O2 -g" + HOST_CFLAGS="-O3 -g" + HOST_CXXFLAGS="-O3 -g" HOST_LDFLAGS=-static-libstdc++ export EXTRA_CXX_FLAGS="-DNAPI_VERSION=5 -DDJINNI_NODEJS" diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index ad040966db..1acaf14979 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -46,8 +46,8 @@ script: | CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-gui-tests" FAKETIME_HOST_PROGS="gcc g++" FAKETIME_PROGS="date ar ranlib nm" - HOST_CFLAGS="-O2 -g" - HOST_CXXFLAGS="-O2 -g" + HOST_CFLAGS="-O3 -g" + HOST_CXXFLAGS="-O3 -g" HOST_LDFLAGS=-static-libstdc++ export QT_RCC_TEST=1 diff --git a/contrib/gitian-descriptors/gitian-osx-electron.yml b/contrib/gitian-descriptors/gitian-osx-electron.yml index 914724df3e..391139336b 100644 --- a/contrib/gitian-descriptors/gitian-osx-electron.yml +++ b/contrib/gitian-descriptors/gitian-osx-electron.yml @@ -46,11 +46,11 @@ script: | WRAP_DIR=$HOME/wrapped HOSTS="x86_64-apple-darwin14" - CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --disable-bench --disable-tests --disable-man --enable-zmq --without-utils --without-daemon --with-node-js-libs --with-qrencode --with-gui=no" + CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --disable-bench --disable-tests --disable-tests --disable-man --enable-zmq --without-utils --without-daemon --with-node-js-libs --with-qrencode --with-gui=no" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg genisoimage" - HOST_CFLAGS="-O2 -g" - HOST_CXXFLAGS="-O2 -g" + HOST_CFLAGS="-O3 -g" + HOST_CXXFLAGS="-O3 -g" HOST_LDFLAGS= export EXTRA_CXX_FLAGS="-DNAPI_VERSION=5 -DDJINNI_NODEJS" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index d80d3d21a4..4430f40e72 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -47,8 +47,8 @@ script: | CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg genisoimage" - HOST_CFLAGS="-O2 -g" - HOST_CXXFLAGS="-O2 -g" + HOST_CFLAGS="-O3 -g" + HOST_CXXFLAGS="-O3 -g" HOST_LDFLAGS= diff --git a/contrib/gitian-descriptors/gitian-win-electron.yml b/contrib/gitian-descriptors/gitian-win-electron.yml index f790fb07a7..531e08cf45 100644 --- a/contrib/gitian-descriptors/gitian-win-electron.yml +++ b/contrib/gitian-descriptors/gitian-win-electron.yml @@ -41,11 +41,11 @@ files: script: | WRAP_DIR=$HOME/wrapped HOSTS="x86_64-w64-mingw32" - CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-man --enable-zmq --with-utils --with-daemon --with-node-js-libs --with-qrencode --with-gui=no" + CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-tests --disable-man --enable-zmq --with-utils --with-daemon --with-node-js-libs --with-qrencode --with-gui=no" FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy" FAKETIME_PROGS="date makensis zip" - HOST_CFLAGS="-O2 -g" - HOST_CXXFLAGS="-O2 -g" + HOST_CFLAGS="-O3 -g" + HOST_CXXFLAGS="-O3 -g" export QT_RCC_TEST=1 export QT_RCC_SOURCE_DATE_OVERRIDE=1 diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index abdf8991f3..38db83ae65 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -42,8 +42,8 @@ script: | CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests" FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy" FAKETIME_PROGS="date makensis zip" - HOST_CFLAGS="-O2 -g" - HOST_CXXFLAGS="-O2 -g" + HOST_CFLAGS="-O3 -g" + HOST_CXXFLAGS="-O3 -g" export QT_RCC_TEST=1 export QT_RCC_SOURCE_DATE_OVERRIDE=1