forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on BSD 

Added extra version statements for OpenBSD, NetBSD and DragonflyBSD,
as these are not included in the BSD version identifier.

Also removed the line `SHELL:=/usr/bin/env bash' from the top of the
makefile because most BSDs don't include bash in the base system, and
the build doesn't need it anyway.

On OpenBSD, using -inline with dmd causes the compiler to crash
because of insufficient memory (with 8 GB), so I added a couple of
ifneq's to use -inline only if the build is not running on OpenBSD.
This commit is contained in:
Jeremy Baxter 2023-12-22 13:39:37 +13:00 committed by Jan Jurzitza
parent 15ea4b37b8
commit 57794ca875
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/dcd/common/socket.d
View File

@ -27,6 +27,9 @@ version (OSX) version = haveUnixSockets;
version (linux) version = haveUnixSockets; version (linux) version = haveUnixSockets;
version (BSD) version = haveUnixSockets; version (BSD) version = haveUnixSockets;
version (FreeBSD) version = haveUnixSockets; version (FreeBSD) version = haveUnixSockets;
version (OpenBSD) version = haveUnixSockets;
version (NetBSD) version = haveUnixSockets;
version (DragonflyBSD) version = haveUnixSockets;
enum DEFAULT_PORT_NUMBER = 9166; enum DEFAULT_PORT_NUMBER = 9166;

12
makefile
View File

@ -13,8 +13,6 @@ LDC := ldc2
DPARSE_DIR := libdparse DPARSE_DIR := libdparse
DSYMBOL_DIR := dsymbol DSYMBOL_DIR := dsymbol
SHELL:=/usr/bin/env bash
githash: githash:
@mkdir -p bin @mkdir -p bin
git describe --tags > bin/githash.txt git describe --tags > bin/githash.txt
@ -37,7 +35,6 @@ CLIENT_SRC := \
DMD_CLIENT_FLAGS := -Imsgpack-d/src\ DMD_CLIENT_FLAGS := -Imsgpack-d/src\
-Imsgpack-d/src\ -Imsgpack-d/src\
-Jbin\ -Jbin\
-inline\
-O\ -O\
-wi\ -wi\
-ofbin/dcd-client -ofbin/dcd-client
@ -56,6 +53,10 @@ LDC_CLIENT_FLAGS := -Imsgpack-d/src\
-oq\ -oq\
-of=bin/dcd-client -of=bin/dcd-client
ifneq ($(shell uname), OpenBSD)
override DMD_CLIENT_FLAGS += -inline
endif
override DMD_CLIENT_FLAGS += $(DFLAGS) override DMD_CLIENT_FLAGS += $(DFLAGS)
override LDC_CLIENT_FLAGS += $(DFLAGS) override LDC_CLIENT_FLAGS += $(DFLAGS)
override GDC_CLIENT_FLAGS += $(DFLAGS) override GDC_CLIENT_FLAGS += $(DFLAGS)
@ -76,7 +77,6 @@ DMD_SERVER_FLAGS := -Icontainers/src\
-wi\ -wi\
-O\ -O\
-release\ -release\
-inline\
-ofbin/dcd-server -ofbin/dcd-server
DEBUG_SERVER_FLAGS := -Icontainers/src\ DEBUG_SERVER_FLAGS := -Icontainers/src\
@ -106,6 +106,10 @@ LDC_SERVER_FLAGS := -Icontainers/src\
-O5\ -O5\
-release -release
ifneq ($(shell uname), OpenBSD)
DMD_SERVER_FLAGS += -inline
endif
override DMD_SERVER_FLAGS += $(DFLAGS) override DMD_SERVER_FLAGS += $(DFLAGS)
override LDC_SERVER_FLAGS += $(DFLAGS) override LDC_SERVER_FLAGS += $(DFLAGS)
override GDC_SERVER_FLAGS += $(DFLAGS) override GDC_SERVER_FLAGS += $(DFLAGS)

3
src/dcd/server/server.d
View File

@ -35,6 +35,9 @@ enum CONFIG_FILE_NAME = "dcd.conf";
version(linux) version = useXDG; version(linux) version = useXDG;
version(BSD) version = useXDG; version(BSD) version = useXDG;
version(FreeBSD) version = useXDG; version(FreeBSD) version = useXDG;
version(OpenBSD) version = useXDG;
version(NetBSD) version = useXDG;
version(DragonflyBSD) version = useXDG;
version(OSX) version = useXDG; version(OSX) version = useXDG;
/** /**