diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/guix/INSTALL.md | 26 | ||||
| -rwxr-xr-x | contrib/guix/guix-build | 2 | ||||
| -rwxr-xr-x | contrib/install_db4.sh | 8 |
3 files changed, 12 insertions, 24 deletions
diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md index 86f91cc87b..63aa3e02b2 100644 --- a/contrib/guix/INSTALL.md +++ b/contrib/guix/INSTALL.md @@ -79,8 +79,8 @@ Guix v1.2.0 is available as a distribution package starting in [Debian 21.04](https://packages.ubuntu.com/hirsute/guix). Note that if you intend on using Guix without using any substitutes (more -details [here][security-model]), v1.2.0 has a known problems when building -GnuTLS from source. Solutions and workarounds are documented +details [here][security-model]), v1.2.0 has a known problem when building GnuTLS +from source. Solutions and workarounds are documented [here](#gnutls-test-suite-fail-status-request-revoked). @@ -124,7 +124,7 @@ particular commit of Guix). Previous experience with using autotools-style build systems to build packages from source will be helpful. *hic sunt dracones.* I strongly urge you to at least skim through the entire section once before you -start issuing commands, as it will save you a lot of unncessary pain and +start issuing commands, as it will save you a lot of unnecessary pain and anguish. ### Installing common build tools @@ -165,7 +165,7 @@ packaged and installable without manually building and installing. For reference, the graphic below outlines Guix v1.3.0's dependency graph: - + #### Guile @@ -270,23 +270,11 @@ Note that these environment variables are used to check for packages during `./configure`, so they should be set as soon as possible should you want to use a prefix other than `/usr`. -<!-- ##### Example: Consistently using Guile 3.0 on Ubuntu --> - -<!-- For example, on Ubuntu, if you choose to use Guile 3.0 and install the --> -<!-- `guile-3.0` package, you want to make sure that if you also want to install the --> -<!-- `guile-git` package with `apt` that said `guile-git` package was built for Guile --> -<!-- v3.0. This can be checked by invoking the following: --> - -<!-- ``` --> -<!-- apt update --> -<!-- apt show guile-git --> -<!-- ``` --> - #### Building and installing source-built packages -***IMPORTANT**: A few dependencies have non-obvious quirks/erratas which are documented in the -sub-sections immediately below. Please read these sections before proceeding to -build and install these packages.* +***IMPORTANT**: A few dependencies have non-obvious quirks/errata which are +documented in the sub-sections immediately below. Please read these sections +before proceeding to build and install these packages.* Although you should always refer to the README or INSTALL files for the most accurate information, most of these dependencies use autoconf-style build diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index f6da8435e9..5a908a507d 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -190,7 +190,7 @@ fi # Services database must have basic entries ################ -if ! getent services http https ftp; then +if ! getent services http https ftp > /dev/null 2>&1; then cat << EOF ERR: Your system's C library can not find service database entries for at least one of the following services: http, https, ftp. diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh index 4037936404..dd4d862dee 100755 --- a/contrib/install_db4.sh +++ b/contrib/install_db4.sh @@ -221,10 +221,10 @@ EOF # The packaged config.guess and config.sub are ancient (2009) and can cause build issues. # Replace them with modern versions. # See https://github.com/bitcoin/bitcoin/issues/16064 -CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b' -CONFIG_GUESS_HASH='2d1ff7bca773d2ec3c6217118129220fa72d8adda67c7d2bf79994b3129232c1' -CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b' -CONFIG_SUB_HASH='3a4befde9bcdf0fdb2763fc1bfa74e8696df94e1ad7aac8042d133c8ff1d2e32' +CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f' +CONFIG_GUESS_HASH='c8f530e01840719871748a8071113435bdfdf75b74c57e78e47898edea8754ae' +CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f' +CONFIG_SUB_HASH='3969f7d5f6967ccc6f792401b8ef3916a1d1b1d0f0de5a4e354c95addb8b800e' rm -f "dist/config.guess" rm -f "dist/config.sub" |