diff options
| author | jsing <> | 2017-04-30 04:44:58 +0000 |
|---|---|---|
| committer | jsing <> | 2017-04-30 04:44:58 +0000 |
| commit | 5952ef2f33ac903c4ae6711762df29c1aba6b640 (patch) | |
| tree | 6dd7e7bcf74c683e17469fe4e4f0086513fbd2ac | |
| parent | 218193cef9ff51b530e3b4dba5b4fdf95fe01bb3 (diff) | |
| download | openbsd-5952ef2f33ac903c4ae6711762df29c1aba6b640.tar.gz openbsd-5952ef2f33ac903c4ae6711762df29c1aba6b640.tar.bz2 openbsd-5952ef2f33ac903c4ae6711762df29c1aba6b640.zip | |
Only enable -Werror on libcrypto/libssl/libtls if we are building with
gcc4. This should avoid failed builds while transitioning compilers.
While here also make the CFLAGS blocks consistent across makefiles.
Discussed with deraadt@, ok beck@
| -rw-r--r-- | src/lib/libcrypto/Makefile | 9 | ||||
| -rw-r--r-- | src/lib/libssl/Makefile | 5 | ||||
| -rw-r--r-- | src/lib/libtls/Makefile | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 9ab1e0349d..13f4ab0de5 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.15 2017/02/28 14:15:37 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.16 2017/04/30 04:44:58 jsing Exp $ |
| 2 | 2 | ||
| 3 | LIB= crypto | 3 | LIB= crypto |
| 4 | 4 | ||
| @@ -13,13 +13,16 @@ CLEANFILES=${PC_FILES} ${VERSION_SCRIPT} | |||
| 13 | 13 | ||
| 14 | LCRYPTO_SRC= ${.CURDIR} | 14 | LCRYPTO_SRC= ${.CURDIR} |
| 15 | 15 | ||
| 16 | CFLAGS+= -Wall -Wundef -Werror | 16 | CFLAGS+= -Wall -Wundef |
| 17 | .if ${COMPILER_VERSION:L} == "gcc4" | ||
| 18 | CFLAGS+= -Werror | ||
| 19 | .endif | ||
| 20 | CFLAGS+= -DLIBRESSL_INTERNAL | ||
| 17 | 21 | ||
| 18 | .if !defined(NOPIC) | 22 | .if !defined(NOPIC) |
| 19 | CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN | 23 | CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN |
| 20 | .endif | 24 | .endif |
| 21 | 25 | ||
| 22 | CFLAGS+= -DLIBRESSL_INTERNAL | ||
| 23 | # Hardware engines | 26 | # Hardware engines |
| 24 | CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this? | 27 | CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this? |
| 25 | 28 | ||
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile index 12a4b4c2fa..809851d251 100644 --- a/src/lib/libssl/Makefile +++ b/src/lib/libssl/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.34 2017/04/29 22:31:42 beck Exp $ | 1 | # $OpenBSD: Makefile,v 1.35 2017/04/30 04:44:58 jsing Exp $ |
| 2 | 2 | ||
| 3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
| 4 | .ifndef NOMAN | 4 | .ifndef NOMAN |
| @@ -12,10 +12,11 @@ CLEANFILES=${PC_FILES} ${VERSION_SCRIPT} | |||
| 12 | LIB= ssl | 12 | LIB= ssl |
| 13 | 13 | ||
| 14 | CFLAGS+= -Wall -Wundef | 14 | CFLAGS+= -Wall -Wundef |
| 15 | .if ${COMPILER_VERSION:L} != "gcc3" | 15 | .if ${COMPILER_VERSION:L} == "gcc4" |
| 16 | CFLAGS+= -Werror | 16 | CFLAGS+= -Werror |
| 17 | .endif | 17 | .endif |
| 18 | CFLAGS+= -DLIBRESSL_INTERNAL | 18 | CFLAGS+= -DLIBRESSL_INTERNAL |
| 19 | |||
| 19 | CFLAGS+= -I${.CURDIR} | 20 | CFLAGS+= -I${.CURDIR} |
| 20 | 21 | ||
| 21 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto | 22 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto |
diff --git a/src/lib/libtls/Makefile b/src/lib/libtls/Makefile index d528ddf5ee..2b09517fbe 100644 --- a/src/lib/libtls/Makefile +++ b/src/lib/libtls/Makefile | |||
| @@ -1,11 +1,14 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.30 2017/01/25 23:53:18 schwarze Exp $ | 1 | # $OpenBSD: Makefile,v 1.31 2017/04/30 04:44:58 jsing Exp $ |
| 2 | 2 | ||
| 3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
| 4 | .ifndef NOMAN | 4 | .ifndef NOMAN |
| 5 | SUBDIR= man | 5 | SUBDIR= man |
| 6 | .endif | 6 | .endif |
| 7 | 7 | ||
| 8 | CFLAGS+= -Wall -Werror -Wimplicit | 8 | CFLAGS+= -Wall -Wimplicit -Wundef |
| 9 | .if ${COMPILER_VERSION:L} == "gcc4" | ||
| 10 | CFLAGS+= -Werror | ||
| 11 | .endif | ||
| 9 | CFLAGS+= -DLIBRESSL_INTERNAL | 12 | CFLAGS+= -DLIBRESSL_INTERNAL |
| 10 | 13 | ||
| 11 | CLEANFILES= ${VERSION_SCRIPT} | 14 | CLEANFILES= ${VERSION_SCRIPT} |