From 5afb1fb946b5538beb34cc4e0027702170b66cf8 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Tue, 10 Dec 2024 15:15:42 -0500 Subject: [PATCH] ci+docs: switch to pkgconf on macOS Change-Id: I9cb98823c41974d37257c72f67693c2ebce23db8 --- .jenkins.d/00-deps.sh | 2 +- docs/INSTALL.rst | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh index b0e54a08..17b544ad 100755 --- a/.jenkins.d/00-deps.sh +++ b/.jenkins.d/00-deps.sh @@ -18,7 +18,7 @@ APT_PKGS=( pkg-config python3 ) -FORMULAE=(boost openssl pkg-config) +FORMULAE=(boost openssl pkgconf) PIP_PKGS=() case $JOB_NAME in *code-coverage) diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst index 09711cfe..0e59b253 100644 --- a/docs/INSTALL.rst +++ b/docs/INSTALL.rst @@ -13,7 +13,7 @@ following platforms: - Debian 11 (bullseye) - Debian 12 (bookworm) - CentOS Stream 9 -- macOS 12 / 13 / 14 +- macOS 12 / 13 / 14 / 15 ndn-cxx should also work on the following platforms, although they are not officially supported: @@ -63,7 +63,7 @@ development tools and libraries: .. code-block:: sh - brew install boost openssl pkg-config + brew install boost openssl pkgconf .. warning:: @@ -186,18 +186,18 @@ The ``./waf install`` command installs the following files: - ``/libndn-cxx.so``, ``/libndn-cxx.so.`` (on Linux), ``/libndn-cxx.dylib``, ``/libndn-cxx..dylib`` (on macOS): shared NDN C++ library (if enabled). -- ``/pkgconfig/libndn-cxx.pc``: pkgconfig file storing all necessary flags to - build against the library. For example, if the ``pkg-config`` or ``pkgconf-pkg-config`` - package is installed and ``PKG_CONFIG_PATH`` is configured properly (or if - ``/pkgconfig`` is a default search path), the command ``pkg-config --cflags - --libs libndn-cxx`` will return all necessary compile and link flags for the library. +- ``/pkgconfig/libndn-cxx.pc``: pkgconfig file storing all necessary flags to build + against the library. For example, if the ``pkg-config`` or ``pkgconf`` package is installed + and ``PKG_CONFIG_PATH`` is configured properly (or if ``/pkgconfig`` is a default + search path), the command ``pkg-config --cflags --libs libndn-cxx`` will return all + necessary compile and link flags for the ndn-cxx library. - ``/ndnsec``: command-line tool to manage NDN keys and certificates. - ``/ndnsec-*``: convenience aliases for ``ndnsec`` tools. If configured with tests (``./waf configure --with-tests``), the above commands will also produce: -- ``build/unit-tests``: a unit test binary for the library. +- ``build/unit-tests``: a unit test binary for the library; it will not be installed. 1.5 GB available memory per CPU core is necessary for efficient compilation. On a multi-core machine with less than 1.5 GB available memory per CPU core, limit the