hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-07 06:56:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix overlinking again after recent ntp updates

Browse Source 
Fix building WITHOUT_OPENSSL
This commit is contained in:
Baptiste Daroussin 2015-05-25 20:27:46 +00:00
parent e14a2a4cf4
commit ef0cb5db0a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=283542
8 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/ntp/Makefile.inc
View File

@ -11,7 +11,7 @@ NTPDEFS= -DSYS_FREEBSD
CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
CFLAGS+= -DOPENSSL
CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
.endif
WARNS?= 0

4
usr.sbin/ntp/config.h
View File

@ -9,7 +9,7 @@
/* #undef ADJTIME_IS_ACCURATE */
/* Support NTP Autokey protocol? */
#define AUTOKEY 1
/* #define AUTOKEY 1 */
/* why not HAVE_P_S? */
/* #undef CALL_PTHREAD_SETCONCURRENCY */
@ -1578,7 +1578,7 @@ typedef unsigned int uintptr_t;
#define USE_FSETOWNCTTY 1
/* Use OpenSSL's crypto random functions */
#define USE_OPENSSL_CRYPTO_RAND 1
/* #define USE_OPENSSL_CRYPTO_RAND 1 */
/* OK to use snprintb()? */
/* #undef USE_SNPRINTB */

2
usr.sbin/ntp/ntp-keygen/Makefile
View File

@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
LIBADD+= ntp opts pthread
.if ${MK_OPENSSL} != "no"
LIBADD+= md crypto
LIBADD+= crypto
.endif
.include <bsd.prog.mk>

4
usr.sbin/ntp/ntpd/Makefile
View File

@ -35,10 +35,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \
-I${.CURDIR}/../ \
-I${.CURDIR}
LIBADD= parse ntp m rt opts md pthread
LIBADD= parse ntp m opts pthread
.if ${MK_OPENSSL} != "no"
LIBADD+= crypto
.else
LIBADD+= md
.endif
CLEANFILES+= .version version.c

6
usr.sbin/ntp/ntpdate/Makefile
View File

@ -14,10 +14,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-I${.CURDIR}/../
LIBADD= rt ntp m pthread
LIBADD= ntp m pthread
.if ${MK_OPENSSL} != "no"
LIBADD+= md ssl crypto
LIBADD+= crypto
.else
LIBADD+= md
.endif
CLEANFILES+= .version version.c

6
usr.sbin/ntp/ntpdc/Makefile
View File

@ -18,12 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-I${.CURDIR}/../ -I${.CURDIR}
LIBADD= edit md ntp m readline opts ncurses pthread
LIBADD= edit ntp m opts pthread
CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
-I${DESTDIR}/${INCLUDEDIR}/edit
.if ${MK_OPENSSL} != "no"
LIBADD+= ssl crypto
LIBADD+= crypto
.else
LIBADD+= md
.endif
CLEANFILES+= .version version.c

6
usr.sbin/ntp/ntpq/Makefile
View File

@ -21,10 +21,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-I${.CURDIR}/../
LIBADD+= edit md ntp opts m pthread
LIBADD+= edit ntp opts m pthread
.if ${MK_OPENSSL} != "no"
LIBADD+= ssl crypto
LIBADD+= crypto
.else
LIBADD+= md
.endif
CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \

4
usr.sbin/ntp/sntp/Makefile
View File

@ -23,7 +23,9 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
LIBADD= m opts ntp ntpevent pthread
.if ${MK_OPENSSL} != "no"
LIBADD+= md ssl crypto
LIBADD+= crypto
.else
LIBADD+= md
.endif
.include <bsd.prog.mk>