f8b892e1fa
@alejandro-colomar reported that the build was broken on MacOS
cc -o build/unitd -pipe -fPIC -fvisibility=hidden -O -W -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -fstrict-aliasing -Wstrict-overflow=5 -Wmissing-prototypes -Werror -g \
build/src/nxt_main.o build/libnxt.a \
\
\
-L/usr/local/Cellar/pcre2/10.40/lib -lpcre2-8
Undefined symbols for architecture x86_64:
"_nxt_fs_mkdir_parent", referenced from:
_nxt_runtime_pid_file_create in libnxt.a(nxt_runtime.o)
_nxt_runtime_controller_socket in libnxt.a(nxt_controller.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make: *** [build/unitd] Error 1
This was due to commit 57fc920 ("Socket: Created control socket & pid file
directories.").
This happened because this commit introduced the usage of
nxt_fs_mkdir_parent() in core code which uses nxt_fs_mkdir(), both of
these are defined in src/nxt_fs.c. It turns out however that this file
doesn't get built on MacOS (or any system that isn't Linux or that
lacks a FreeBSD compatible nmount(2) system call) due to the following
In auto/sources we have
if [ $NXT_HAVE_ROOTFS = YES ]; then
NXT_LIB_SRCS="$NXT_LIB_SRCS src/nxt_fs.c"
fi
NXT_HAVE_ROOTFS is set in auto/isolation
If [ $NXT_HAVE_MOUNT = YES -a $NXT_HAVE_UNMOUNT = YES ]; then
NXT_HAVE_ROOTFS=YES
cat << END >> $NXT_AUTO_CONFIG_H
#ifndef NXT_HAVE_ISOLATION_ROOTFS
#define NXT_HAVE_ISOLATION_ROOTFS 1
#endif
END
fi
While we do have a check for a generic umount(2) which is found on
MacOS, for mount(2) we currently only check for the Linux mount(2) and
FreeBSD nmount(2) system calls. So NXT_HAVE_ROOTFS is set to NO on MacOS
and we don't build src/nxt_fs.c
This fixes the immediate build issue by taking the mount/umount OS
support out of nxt_fs.c into a new nxt_fs_mount.c file which is guarded
by the above while we now build nxt_fs.c unconditionally.
This should fix the build on any _supported_ system.
Reported-by: Alejandro Colomar <alx@nginx.com>
Fixes: 57fc920 ("Socket: Created control socket & pid file directories.")
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
174 lines
3.9 KiB
C
174 lines
3.9 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
* Copyright (C) NGINX, Inc.
|
|
*/
|
|
|
|
#ifndef _NXT_LIB_H_INCLUDED_
|
|
#define _NXT_LIB_H_INCLUDED_
|
|
|
|
|
|
#include <nxt_auto_config.h>
|
|
#include <nxt_version.h>
|
|
|
|
#define NXT_SERVER "Unit/" NXT_VERSION
|
|
|
|
typedef struct nxt_port_s nxt_port_t;
|
|
typedef struct nxt_task_s nxt_task_t;
|
|
typedef struct nxt_port_recv_msg_s nxt_port_recv_msg_t;
|
|
typedef void (*nxt_port_handler_t)(nxt_task_t *task, nxt_port_recv_msg_t *msg);
|
|
typedef struct nxt_port_handlers_s nxt_port_handlers_t;
|
|
typedef struct nxt_sig_event_s nxt_sig_event_t;
|
|
typedef struct nxt_runtime_s nxt_runtime_t;
|
|
|
|
typedef struct nxt_thread_s nxt_thread_t;
|
|
typedef struct nxt_event_engine_s nxt_event_engine_t;
|
|
typedef struct nxt_log_s nxt_log_t;
|
|
typedef struct nxt_thread_pool_s nxt_thread_pool_t;
|
|
|
|
typedef void (*nxt_work_handler_t)(nxt_task_t *task, void *obj, void *data);
|
|
|
|
#include <nxt_unix.h>
|
|
#include <nxt_clang.h>
|
|
#include <nxt_types.h>
|
|
#include <nxt_time.h>
|
|
#include <nxt_mp.h>
|
|
#include <nxt_array.h>
|
|
|
|
typedef uint16_t nxt_port_id_t;
|
|
|
|
#include <nxt_queue.h>
|
|
|
|
#include <nxt_thread_id.h>
|
|
|
|
#include <nxt_errno.h>
|
|
#include <nxt_file.h>
|
|
|
|
#include <nxt_random.h>
|
|
#include <nxt_string.h>
|
|
#include <nxt_lvlhsh.h>
|
|
#include <nxt_atomic.h>
|
|
#include <nxt_spinlock.h>
|
|
#include <nxt_work_queue.h>
|
|
#include <nxt_log.h>
|
|
#include <nxt_thread_time.h>
|
|
#include <nxt_rbtree.h>
|
|
#include <nxt_timer.h>
|
|
#include <nxt_fiber.h>
|
|
#include <nxt_thread.h>
|
|
#include <nxt_process_type.h>
|
|
#include <nxt_capability.h>
|
|
#include <nxt_credential.h>
|
|
#include <nxt_fs_mount.h>
|
|
#include <nxt_fs.h>
|
|
#include <nxt_process.h>
|
|
#include <nxt_utf8.h>
|
|
#include <nxt_file_name.h>
|
|
|
|
#include <nxt_sprintf.h>
|
|
#include <nxt_parse.h>
|
|
#include <nxt_var.h>
|
|
|
|
|
|
/* TODO: remove unused */
|
|
|
|
typedef struct nxt_fd_event_s nxt_fd_event_t;
|
|
typedef struct nxt_sockaddr_s nxt_sockaddr_t;
|
|
|
|
|
|
#include <nxt_malloc.h>
|
|
#include <nxt_mem_map.h>
|
|
#include <nxt_socket.h>
|
|
#include <nxt_dyld.h>
|
|
|
|
|
|
typedef void *(*nxt_mem_proto_alloc_t)(void *pool, size_t size);
|
|
typedef void (*nxt_mem_proto_free_t)(void *pool, void *p);
|
|
|
|
typedef struct {
|
|
nxt_mem_proto_alloc_t alloc;
|
|
nxt_mem_proto_free_t free;
|
|
} nxt_mem_proto_t;
|
|
|
|
|
|
#include <nxt_mem_zone.h>
|
|
#include <nxt_signal.h>
|
|
#include <nxt_semaphore.h>
|
|
|
|
#include <nxt_djb_hash.h>
|
|
#include <nxt_murmur_hash.h>
|
|
#include <nxt_hash.h>
|
|
|
|
#include <nxt_sort.h>
|
|
#include <nxt_vector.h>
|
|
#include <nxt_list.h>
|
|
|
|
#include <nxt_service.h>
|
|
|
|
typedef struct nxt_buf_s nxt_buf_t;
|
|
#include <nxt_buf.h>
|
|
#include <nxt_buf_pool.h>
|
|
#include <nxt_recvbuf.h>
|
|
|
|
typedef struct nxt_conn_s nxt_conn_t;
|
|
#include <nxt_sendbuf.h>
|
|
|
|
#include <nxt_log_moderation.h>
|
|
|
|
#if (NXT_TLS)
|
|
#include <nxt_tls.h>
|
|
#endif
|
|
|
|
|
|
#define nxt_thread() \
|
|
(nxt_thread_t *) nxt_thread_get_data(nxt_thread_context)
|
|
|
|
nxt_thread_extern_data(nxt_thread_t, nxt_thread_context);
|
|
|
|
|
|
#include <nxt_thread_log.h>
|
|
|
|
#include <nxt_fd_event.h>
|
|
#include <nxt_file_event.h>
|
|
|
|
#include <nxt_port.h>
|
|
#include <nxt_port_memory.h>
|
|
#include <nxt_port_rpc.h>
|
|
#include <nxt_thread_pool.h>
|
|
|
|
|
|
typedef void (*nxt_event_conn_handler_t)(nxt_thread_t *thr, nxt_conn_t *c);
|
|
#include <nxt_listen_socket.h>
|
|
|
|
#include <nxt_conn.h>
|
|
#include <nxt_event_engine.h>
|
|
|
|
#include <nxt_job.h>
|
|
#include <nxt_job_file.h>
|
|
#include <nxt_buf_filter.h>
|
|
|
|
#include <nxt_sockaddr.h>
|
|
|
|
#include <nxt_cache.h>
|
|
|
|
#include <nxt_http_parse.h>
|
|
#include <nxt_runtime.h>
|
|
#include <nxt_port_hash.h>
|
|
|
|
|
|
/*
|
|
* The envp argument must be &environ if application may
|
|
* change its process title with nxt_process_title().
|
|
*/
|
|
NXT_EXPORT nxt_int_t nxt_lib_start(const char *app, char **argv, char ***envp);
|
|
NXT_EXPORT void nxt_lib_stop(void);
|
|
|
|
|
|
NXT_EXPORT extern nxt_uint_t nxt_ncpu;
|
|
NXT_EXPORT extern nxt_uint_t nxt_pagesize;
|
|
NXT_EXPORT extern nxt_task_t nxt_main_task;
|
|
NXT_EXPORT extern nxt_atomic_t nxt_task_ident;
|
|
|
|
|
|
#endif /* _NXT_LIB_H_INCLUDED_ */
|