highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-07-25 23:58:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#35775: scripted-diff: Use C.UTF-8 locale in Guix scripts

Browse Source 
2cb3bfa8df scripted-diff: Use long form of shell options in Guix scripts (Hennadii Stepanov)
711eb10f08 guix: Add copyright headers to Guix scripts (Hennadii Stepanov)
80f831494e guix: Fix `glibc` version in comment (Hennadii Stepanov)
8916f7967e scripted-diff: Use C.UTF-8 locale in Guix scripts (Hennadii Stepanov)

Pull request description:

  The C.UTF-8 locale is set by default in `guix shell`, and there is no reason to avoid it nowadays. This PR also silences superfluous warnings from Qt tools, making build logs cleaner and other issues easier to spot. For example:
  ```
  Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8.
  Qt depends on a UTF-8 locale, and has switched to "C.UTF-8" instead.
  If this causes problems, reconfigure your locale. See the locale(1) manual
  for more information.
  ```

  Locales in the `guix-*` launch scripts have been updated as well for consistency with the rest of the codebase.

  Additionally, the headers of the Guix scripts have been adjusted for [uniformity](https://github.com/bitcoin/bitcoin/pull/35775#discussion_r3636959268).

ACKs for top commit:
  fanquake:
    ACK 2cb3bfa8df

Tree-SHA512: 9e21d4ad50f5d583efdd8f79d9f96d45a92f1982ea3a422565bceea38aa50bbd9a9360972b37a1b49907e67523d68f3d1f889cb26179ce735453eb4fae4d3fa4
This commit is contained in:
merge-script
2026-07-23 14:33:55 +01:00
parent d472a7798a 2cb3bfa8df
commit 290cb2f17e
16 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/guix/guix-attest
View File

@@ -1,6 +1,9 @@
#!/usr/bin/env bash
export LC_ALL=C
set -e -o pipefail
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Source the common prelude, which:
# 1. Checks if we're at the top directory of the Bitcoin Core repository

5
contrib/guix/guix-build
View File

@@ -1,5 +1,8 @@
#!/usr/bin/env bash
export LC_ALL=C
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Source the common prelude, which:

7
contrib/guix/guix-clean
View File

@@ -1,6 +1,9 @@
#!/usr/bin/env bash
export LC_ALL=C
set -e -o pipefail
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Source the common prelude, which:
# 1. Checks if we're at the top directory of the Bitcoin Core repository

7
contrib/guix/guix-codesign
View File

@@ -1,6 +1,9 @@
#!/usr/bin/env bash
export LC_ALL=C
set -e -o pipefail
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Source the common prelude, which:
# 1. Checks if we're at the top directory of the Bitcoin Core repository

7
contrib/guix/guix-verify
View File

@@ -1,6 +1,9 @@
#!/usr/bin/env bash
export LC_ALL=C
set -e -o pipefail
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Source the common prelude, which:
# 1. Checks if we're at the top directory of the Bitcoin Core repository

2
contrib/guix/libexec/build_linux.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# shellcheck source=setup.sh

2
contrib/guix/libexec/build_linux_gui.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# shellcheck source=setup.sh

2
contrib/guix/libexec/build_macos.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# shellcheck source=setup.sh

2
contrib/guix/libexec/build_macos_gui.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# shellcheck source=setup.sh

2
contrib/guix/libexec/build_win.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# shellcheck source=setup.sh

2
contrib/guix/libexec/build_win_gui.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# shellcheck source=setup.sh

8
contrib/guix/libexec/codesign.sh
View File

@@ -1,9 +1,9 @@
#!/usr/bin/env bash
# Copyright (c) 2021-present The Bitcoin Core developers
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
export LC_ALL=C
set -e -o pipefail
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Environment variables for determinism
export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"

4
contrib/guix/libexec/package.sh
View File

@@ -2,8 +2,8 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
set -e -o pipefail
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
(
cd "$DISTSRC"

5
contrib/guix/libexec/prelude.bash
View File

@@ -1,5 +1,8 @@
#!/usr/bin/env bash
export LC_ALL=C
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
source contrib/shell/realpath.bash

2
contrib/guix/libexec/setup.sh
View File

@@ -2,7 +2,7 @@
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit.
export LC_ALL=C
export LC_ALL=C.UTF-8
set -o errexit -o pipefail
# Environment variables for determinism

2
contrib/guix/manifest_build.scm
View File

@@ -209,7 +209,7 @@ chain for " target " development."))
(define-public glibc-2.31
(let ((commit "28eb5caf895ced5d895cb02757e109004a2d33e5"))
(package
(inherit glibc) ;; 2.39
(inherit glibc) ;; 2.41
(version "2.31")
(source (origin
(method git-fetch)