j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge pull request #1 from jan-schreib/openbsd-build

Browse source 
Changes on Makefile.am and configure.ac to enable stack protection build on OpenBSD
This commit is contained in:
Rafał Leśniak 2015-08-25 10:17:33 +02:00
commit 569b1dbf15
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -50,6 +50,7 @@ case $host_os in
;; ;;
*openbsd*) *openbsd*)
bsd=true bsd=true
openbsd=true
AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD]) AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
;; ;;
*netbsd*) *netbsd*)
@ -133,6 +134,7 @@ AC_ARG_WITH(windows2000,
AM_CONDITIONAL(LINUX, test "$linux" = true) AM_CONDITIONAL(LINUX, test "$linux" = true)
AM_CONDITIONAL(BSD, test "$bsd" = true) AM_CONDITIONAL(BSD, test "$bsd" = true)
AM_CONDITIONAL(OPENBSD, test "$openbsd" = true)
AM_CONDITIONAL(DARWIN, test "$darwin" = true) AM_CONDITIONAL(DARWIN, test "$darwin" = true)
AM_CONDITIONAL(SOLARIS, test "$solaris" = true) AM_CONDITIONAL(SOLARIS, test "$solaris" = true)
AM_CONDITIONAL(MINGW, test "$mingw" = true) AM_CONDITIONAL(MINGW, test "$mingw" = true)

6
src/Makefile.am
View file

@ -191,10 +191,12 @@ sptps_test_LDADD = libtincd.la libed25519.la libtincconf.la libchacha_poly1305.l
sptps_keypair_LDADD = libed25519.la libtincconf.la libchacha_poly1305.la libtincd.la libchacha_poly1305.la sptps_keypair_LDADD = libed25519.la libtincconf.la libchacha_poly1305.la libtincd.la libchacha_poly1305.la
if !DARWIN if !DARWIN
if !OPENBSD
sptps_speed_LDADD += -lrt sptps_speed_LDADD += -lrt
sptps_test_LDADD += -lrt sptps_test_LDADD += -lrt
sptps_keypair_LDADD += -lrt sptps_keypair_LDADD += -lrt
endif endif
endif
LIBS = @LIBS@ -lm LIBS = @LIBS@ -lm
@ -203,4 +205,8 @@ LIBS += -lpcap
endif endif
AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote. AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote.
if OPENBSD
AM_CFLAGS += -fstack-protector-all
endif
#-fsanitize=address #-fsanitize=address