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>
49 lines
991 B
C
49 lines
991 B
C
/*
|
|
* Copyright (C) NGINX, Inc.
|
|
*/
|
|
|
|
#ifndef _NXT_FS_MOUNT_H_INCLUDED_
|
|
#define _NXT_FS_MOUNT_H_INCLUDED_
|
|
|
|
|
|
typedef enum nxt_fs_type_s nxt_fs_type_t;
|
|
typedef enum nxt_fs_flags_s nxt_fs_flags_t;
|
|
typedef struct nxt_fs_mount_s nxt_fs_mount_t;
|
|
|
|
|
|
enum nxt_fs_type_s {
|
|
NXT_FS_UNKNOWN = 0,
|
|
NXT_FS_BIND,
|
|
NXT_FS_TMP,
|
|
NXT_FS_PROC,
|
|
NXT_FS_LAST,
|
|
};
|
|
|
|
|
|
enum nxt_fs_flags_s {
|
|
NXT_FS_FLAGS_NOSUID = 1 << 0,
|
|
NXT_FS_FLAGS_NOEXEC = 1 << 1,
|
|
NXT_FS_FLAGS_NOTIME = 1 << 2,
|
|
NXT_FS_FLAGS_NODEV = 1 << 3,
|
|
NXT_FS_FLAGS_RDONLY = 1 << 4,
|
|
};
|
|
|
|
|
|
struct nxt_fs_mount_s {
|
|
u_char *src;
|
|
u_char *dst;
|
|
nxt_fs_type_t type;
|
|
u_char *name;
|
|
nxt_fs_flags_t flags;
|
|
u_char *data;
|
|
nxt_uint_t builtin; /* 1-bit */
|
|
nxt_uint_t deps; /* 1-bit */
|
|
};
|
|
|
|
|
|
nxt_int_t nxt_fs_mount(nxt_task_t *task, nxt_fs_mount_t *mnt);
|
|
void nxt_fs_unmount(const u_char *path);
|
|
|
|
|
|
#endif /* _NXT_FS_MOUNT_H_INCLUDED_ */
|