Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
4e0af5ef
Commit
4e0af5ef
authored
Nov 11, 2018
by
David Carlier
Browse files
DragonFlyBSD little build fix
parent
7721fe83
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
4e0af5ef
...
@@ -106,6 +106,10 @@ else
...
@@ -106,6 +106,10 @@ else
ifeq
($(uname_S),FreeBSD)
ifeq
($(uname_S),FreeBSD)
# FreeBSD
# FreeBSD
FINAL_LIBS
+=
-lpthread
FINAL_LIBS
+=
-lpthread
else
ifeq
($(uname_S),DragonFly)
# FreeBSD
FINAL_LIBS
+=
-lpthread
else
else
# All the other OSes (notably Linux)
# All the other OSes (notably Linux)
FINAL_LDFLAGS
+=
-rdynamic
FINAL_LDFLAGS
+=
-rdynamic
...
@@ -115,6 +119,7 @@ endif
...
@@ -115,6 +119,7 @@ endif
endif
endif
endif
endif
endif
endif
endif
# Include paths to dependencies
# Include paths to dependencies
FINAL_CFLAGS
+=
-I
../deps/hiredis
-I
../deps/linenoise
-I
../deps/lua/src
FINAL_CFLAGS
+=
-I
../deps/hiredis
-I
../deps/linenoise
-I
../deps/lua/src
...
...
src/setproctitle.c
View file @
4e0af5ef
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
#include <errno.h>
/* errno program_invocation_name program_invocation_short_name */
#include <errno.h>
/* errno program_invocation_name program_invocation_short_name */
#if !defined(HAVE_SETPROCTITLE)
#if !defined(HAVE_SETPROCTITLE)
#if (defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__)
#if (defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__
|| defined __DragonFly__
)
#define HAVE_SETPROCTITLE 1
#define HAVE_SETPROCTITLE 1
#else
#else
#define HAVE_SETPROCTITLE 0
#define HAVE_SETPROCTITLE 0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment