From 17bb58d8bb50f901cdb05d00a5857b2d08810844 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 4 Sep 2022 17:50:03 +0300 Subject: [PATCH] Improve NetBSD build instructions. --- build.html | 6 +++--- tdutils/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.html b/build.html index 88739752d..6174e7669 100644 --- a/build.html +++ b/build.html @@ -746,7 +746,7 @@ function onOptionsChanged() { pre_text.push('Note that building requires a lot of memory, so you may need to increase allowed per-process memory usage in /etc/login.conf or build from root.'); } if (os_netbsd) { - pre_text.push('Note that the following instruction is for NetBSD 8.0 and default SH shell.'); + pre_text.push('Note that the following instruction is for NetBSD 8+ and default SH shell.'); } if (os_mac) { pre_text.push('Note that the following instruction will build TDLib only for ' + os_mac_host_name + '.'); @@ -917,8 +917,8 @@ function onOptionsChanged() { if (!use_root) { commands.push('su -'); } - commands.push('export PKG_PATH=ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/i386/8.0_2019Q2/All'); - var packages = 'git gperf php-7.3.6 cmake openssl gcc5-libs'; + commands.push('export PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r)/All'); + var packages = 'git gperf php-8* cmake openssl gcc12-libs mozilla-rootcerts-openssl'; commands.push('pkg_add ' + packages); if (!use_root) { commands.push('exit'); diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt index 59722ca8c..19c896bbe 100644 --- a/tdutils/CMakeLists.txt +++ b/tdutils/CMakeLists.txt @@ -399,7 +399,8 @@ if (ANDROID) endif() if (CMAKE_SYSTEM_NAME MATCHES "NetBSD") - target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so) + target_link_directories(tdutils PUBLIC /usr/pkg/gcc12/x86_64--netbsd/lib /usr/pkg/gcc12/i486--netbsdelf/lib) + target_link_libraries(tdutils PUBLIC atomic) endif() install(TARGETS tdutils EXPORT TdTargets