Skip to content

Commit

Permalink
build+docs: recommend Xcode 13 or later
Browse files Browse the repository at this point in the history
We are not testing Xcode 12 / macOS 11 in CI anymore

Change-Id: I14f2800caab6cd105cf47714d2daab831d2ea587
  • Loading branch information
Pesa committed Jun 7, 2024
1 parent c4f8bd1 commit 2be774b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .waf-tools/default-compiler-flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ def configure(conf):
if Utils.unversioned_sys_platform() == 'darwin':
if ccver < (10, 0, 0):
errmsg = ('The version of Xcode you are using is too old.\n'
'The minimum supported Xcode version is 12.4.')
elif ccver < (12, 0, 0):
warnmsg = ('Using a version of Xcode older than 12.4 is not '
'The minimum supported Xcode version is 13.0.')
elif ccver < (13, 0, 0):
warnmsg = ('Using a version of Xcode older than 13.0 is not '
'officially supported and may result in build failures.')
elif ccver < (7, 0, 0):
errmsg = ('The version of clang you are using is too old.\n'
Expand Down
37 changes: 19 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,31 @@ RUN apt-get install -Uy --no-install-recommends \
ARG JOBS
ARG SOURCE_DATE_EPOCH
RUN --mount=rw,target=/src <<EOF
set -eux
cd /src
./waf configure \
--prefix=/usr \
--libdir=/usr/lib \
--sysconfdir=/etc \
--localstatedir=/var \
--sharedstatedir=/var \
--disable-static \
--enable-shared
./waf build
./waf install
mkdir -p /deps/debian
touch /deps/debian/control
cd /deps
dpkg-shlibdeps --ignore-missing-info /usr/lib/libndn-cxx.so.* /usr/bin/ndnsec -O \
| sed -n 's|^shlibs:Depends=||p' | sed 's| ([^)]*),\?||g' > ndn-cxx
set -eux
cd /src
./waf configure \
--prefix=/usr \
--libdir=/usr/lib \
--sysconfdir=/etc \
--localstatedir=/var \
--sharedstatedir=/var \
--disable-static \
--enable-shared
./waf build
./waf install
mkdir -p /deps/debian
touch /deps/debian/control
cd /deps
dpkg-shlibdeps --ignore-missing-info /usr/lib/libndn-cxx.so.* /usr/bin/ndnsec -O \
| sed -n 's|^shlibs:Depends=||p' | sed 's| ([^)]*),\?||g' > ndn-cxx
EOF


FROM ubuntu:24.04 AS runtime

RUN --mount=from=build,source=/deps,target=/deps \
apt-get install -Uy --no-install-recommends $(cat /deps/ndn-cxx) \
apt-get install -Uy --no-install-recommends \
$(cat /deps/ndn-cxx) \
&& apt-get distclean

RUN --mount=from=build,source=/usr,target=/build \
Expand Down
7 changes: 4 additions & 3 deletions docs/INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ following platforms:

- Ubuntu 20.04 (focal)
- Ubuntu 22.04 (jammy)
- Ubuntu 24.04 (noble)
- Debian 11 (bullseye)
- Debian 12 (bookworm)
- CentOS Stream 9
- macOS 11 / 12 / 13 / 14
- macOS 12 / 13 / 14

ndn-cxx should also work on the following platforms, although they are not officially
supported:
Expand All @@ -21,7 +22,7 @@ supported:
- Fedora >= 33
- Alpine >= 3.12
- Any version of Raspberry Pi OS based on Debian 11 (bullseye) or later
- macOS 10.15
- macOS >= 10.15
- FreeBSD >= 12.2

Prerequisites
Expand All @@ -31,7 +32,7 @@ Required
~~~~~~~~

- GCC >= 9.3 or clang >= 7.0 (if you are on Linux or FreeBSD)
- Xcode >= 12.4 or corresponding version of Command Line Tools (if you are on macOS)
- Xcode >= 13.0 or corresponding version of Command Line Tools (if you are on macOS)
- Python >= 3.8
- pkg-config
- Boost >= 1.71.0
Expand Down

0 comments on commit 2be774b

Please sign in to comment.