F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: (merges !837) Remove libgcrypt detection

Browse Source
This commit is contained in:
Tom Henderson
2022-01-02 12:26:02 -08:00
parent 8c8c3b49a2
commit 4ee323f8fd
8 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildsupport/custom_modules/waf_workaround_fakeconfig.cmake
View File

@@ -12,7 +12,6 @@
# Examples : not enabled (defaults to disabled)
# File descriptor NetDevice : enabled
# GNU Scientific Library (GSL) : enabled
# Gcrypt library : not enabled (libgcrypt not found: you can use libgcrypt-config to find its location.)
# GtkConfigStore : enabled
# MPI Support : not enabled (option --enable-mpi not selected)
# NS-3 Click Integration : not enabled (nsclick not enabled (see option --with-nsclick))
@@ -127,9 +126,6 @@ macro(write_fakewaf_config)
string(APPEND out "GNU Scientific Library (GSL) : ")
check_on_or_off("${NS3_GSL}" "${GSL_FOUND}")
# string(APPEND out "Gcrypt library : not enabled (libgcrypt
# not found: you can use libgcrypt-config to find its location.)
string(APPEND out "GtkConfigStore : ")
check_on_or_off("${NS3_GTK3}" "${GTK3_FOUND}")

1
doc/tutorial/source/getting-started.rst
View File

@@ -619,7 +619,6 @@ output that looks similar to the following::
Examples : enabled
File descriptor NetDevice : enabled
GNU Scientific Library (GSL) : not enabled (GSL not found)
Gcrypt library : not enabled (libgcrypt not found: you can use libgcrypt-config to find its location.)
GtkConfigStore : not enabled (library 'gtk+-3.0 >= 3.0' not found)
MPI Support : not enabled (option --enable-mpi not selected)
NS-3 Click Integration : not enabled (nsclick not enabled (see option --with-nsclick))

2
utils/tests/gitlab-ci-doc.yml
View File

@@ -5,7 +5,7 @@
stage: documentation
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel ninja cmake python ccache gsl libgcrypt gtk3 boost --noconfirm
- pacman -Sy base-devel ninja cmake python ccache gsl gtk3 boost --noconfirm
- pacman -Sy git doxygen graphviz imagemagick dia texlive-core texlive-bin texlive-latexextra python-sphinx --noconfirm
# no policy is a good policy.
- mv /etc/ImageMagick-7/policy.xml /etc/ImageMagick-7/policy.xml.bak

2
utils/tests/gitlab-ci-fedora.yml
View File

@@ -14,7 +14,7 @@
- $RELEASE == "weekly"
- $FEDORA == "True"
before_script:
- dnf install gcc gcc-c++ cmake ninja-build python python-devel ccache gsl gsl-devel libgcrypt gtk3 gtk3-devel sqlite sqlite-devel libxml2 libxml2-devel openmpi openmpi-devel boost-devel pygobject3-devel python3-gobject gobject-introspection-devel goocanvas2-devel graphviz-devel graphviz ipython --assumeyes
- dnf install gcc gcc-c++ cmake ninja-build python python-devel ccache gsl gsl-devel gtk3 gtk3-devel sqlite sqlite-devel libxml2 libxml2-devel openmpi openmpi-devel boost-devel pygobject3-devel python3-gobject gobject-introspection-devel goocanvas2-devel graphviz-devel graphviz ipython --assumeyes
variables:
COMPILER: g++

2
utils/tests/gitlab-ci-pybindgen.yml
View File

@@ -6,7 +6,7 @@
# - $PYBINDGEN == "True"
# before_script:
# - pacman -Syu --noconfirm
# - pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost wget git --noconfirm
# - pacman -Sy base-devel python ccache gsl gtk3 boost wget git --noconfirm
# - wget --no-check-certificate https://nat.onthewifi.net/ns3/castxml-git-0.3.4.r19.g8625aed-1-x86_64.pkg.tar
# - wget --no-check-certificate https://nat.onthewifi.net/ns3/python-pybindgen-0.21.0-1-x86_64.pkg.tar
# - wget --no-check-certificate https://nat.onthewifi.net/ns3/python-pygccxml-git-1.9.0.r104.g84be336-1-any.pkg.tar

16
utils/tests/gitlab-ci-test.yml
View File

@@ -39,7 +39,7 @@ daily-test-debug:
- linux
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
# Run the test.py script with files compiled in release mode
daily-test-release:
@@ -53,7 +53,7 @@ daily-test-release:
- $RELEASE == "daily"
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
# Run the test.py script with files compiled in optimized mode
daily-test-optimized:
@@ -67,7 +67,7 @@ daily-test-optimized:
- $RELEASE == "daily"
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
### Valgrind tests
# Run the test.py script with files compiled in optimized mode + valgrind (daily)
@@ -86,7 +86,7 @@ daily-test-optimized-valgrind:
- linux
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
# Run the test.py script with files compiled in debug mode
weekly-test-debug-valgrind:
@@ -104,7 +104,7 @@ weekly-test-debug-valgrind:
- linux
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
# Run the test.py script with files compiled in release mode
weekly-test-release-valgrind:
@@ -122,7 +122,7 @@ weekly-test-release-valgrind:
- linux
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
# Run the test.py script with files compiled in optimized mode
weekly-test-optimized-valgrind:
@@ -140,7 +140,7 @@ weekly-test-optimized-valgrind:
- linux
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm
# Do a check for the TAKES_FOREVER jobs, only in optimized mode
weekly-test-takes-forever-optimized:
@@ -158,4 +158,4 @@ weekly-test-takes-forever-optimized:
- linux
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost valgrind ninja cmake --noconfirm

8
utils/tests/gitlab-ci.yml
View File

@@ -70,7 +70,7 @@ per-commit-compile-debug:
MODE: debug
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost ninja cmake --noconfirm
per-commit-compile-release:
extends: .base-build
@@ -85,7 +85,7 @@ per-commit-compile-release:
MODE: release
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost ninja cmake --noconfirm
per-commit-compile-optimized:
extends: .base-build
@@ -100,7 +100,7 @@ per-commit-compile-optimized:
MODE: optimized
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost ninja cmake --noconfirm
- pacman -Sy base-devel python ccache gsl gtk3 boost ninja cmake --noconfirm
# .cmake-build:
# stage: build
@@ -131,7 +131,7 @@ per-commit-compile-optimized:
# MODE: release
# before_script:
# - pacman -Syu --noconfirm
# - pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost ninja cmake --noconfirm
# - pacman -Sy base-devel python ccache gsl gtk3 boost ninja cmake --noconfirm
# Weekly jobs for other distribution and compilers
include:

7
wscript
View File

@@ -901,13 +901,6 @@ def configure(conf):
conf.env['ENABLE_GSL'],
"GSL not found")
conf.find_program('libgcrypt-config', var='LIBGCRYPT_CONFIG', msg="libgcrypt-config", mandatory=False)
if env.LIBGCRYPT_CONFIG:
conf.check_cfg(path=env.LIBGCRYPT_CONFIG, msg="Checking for libgcrypt", args='--cflags --libs', package='',
define_name="HAVE_GCRYPT", global_define=True, uselib_store='GCRYPT', mandatory=False)
conf.report_optional_feature("libgcrypt", "Gcrypt library",
conf.env.HAVE_GCRYPT, "libgcrypt not found: you can use libgcrypt-config to find its location.")
why_not_desmetrics = "defaults to disabled"
if Options.options.enable_desmetrics:
conf.env['ENABLE_DES_METRICS'] = True