From daba3b96a004ec96ca397bf164ee4b62d6b3a4c3 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 8 Mar 2026 18:52:53 +0300 Subject: [PATCH] 1 --- build_linux_full.sh | 27 +++++++++++++++++++++++++++ lib/mem.c | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100755 build_linux_full.sh diff --git a/build_linux_full.sh b/build_linux_full.sh new file mode 100755 index 0000000..539173f --- /dev/null +++ b/build_linux_full.sh @@ -0,0 +1,27 @@ +#!/bin/sh +mkdir -p m4 +set -e + +echo "=== Полная пересборка uTun ===" + +# 1. Очистка +echo "[1/4] Очистка..." +make distclean 2>/dev/null || true +rm -f config.h config.status config.log +rm -f configure.log autoreconf.log build.log + +# 2. Автогенерация (autoreconf) +echo "[2/4] Автогенерация (autoreconf -fi)..." +autoreconf -fi 2>&1 | tee autoreconf.log + +# 3. Конфигурация +echo "[3/4] Конфигурация..." +./configure --prefix=/usr/local 2>&1 | tee configure.log + +# 4. Сборка +echo "[4/4] Сборка..." +make -j$(nproc) 2>&1 | tee build.log + +echo "" +echo "=== Готово ===" +echo "Бинарный файл: src/utun" diff --git a/lib/mem.c b/lib/mem.c index f079ee1..12a9905 100644 --- a/lib/mem.c +++ b/lib/mem.c @@ -17,7 +17,7 @@ #define LOCATION_MAX (METADATA_SIZE - POINTER_SIZE) #define NEXT_OFFSET LOCATION_MAX -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) #include #include #define BACKTRACE_ENABLED 1 @@ -29,7 +29,7 @@ #define BACKTRACE_ENABLED 0 #endif -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) static pthread_mutex_t alloc_mutex = PTHREAD_MUTEX_INITIALIZER; #define LOCK() pthread_mutex_lock(&alloc_mutex) #define UNLOCK() pthread_mutex_unlock(&alloc_mutex)