From ad2a38ab4ae5d542206527dfa59a333352ea99ce Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 22 Mar 2015 06:18:18 -0500 Subject: rework CFLAGS/CPPFLAGS settings during configuration Move define adjustments to CPPFLAGS. Adjust user CFLAGS directly, do not override during configuration. USER_CFLAGS is not necessary to build libcompat_noopt correctly. --- Makefile.am.common | 4 ++-- apps/Makefile.am | 1 - configure.ac | 22 +++++++++++++--------- crypto/Makefile.am | 14 ++++++-------- crypto/Makefile.am.elf-x86_64 | 30 +++++++++++++++--------------- crypto/Makefile.am.macosx-x86_64 | 30 +++++++++++++++--------------- ssl/Makefile.am | 1 - tls/Makefile.am | 1 - 8 files changed, 51 insertions(+), 52 deletions(-) diff --git a/Makefile.am.common b/Makefile.am.common index af20a0f..7a25d09 100644 --- a/Makefile.am.common +++ b/Makefile.am.common @@ -1,2 +1,2 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CPPFLAGS += -DLIBRESSL_INTERNAL +AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -DLIBRESSL_INTERNAL diff --git a/apps/Makefile.am b/apps/Makefile.am index 30978c1..3604349 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am @@ -2,7 +2,6 @@ include $(top_srcdir)/Makefile.am.common bin_PROGRAMS = openssl -openssl_CFLAGS = $(USER_CFLAGS) openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) openssl_LDADD += $(top_builddir)/ssl/libssl.la openssl_LDADD += $(top_builddir)/crypto/libcrypto.la diff --git a/configure.ac b/configure.ac index 9c5e188..6d5a290 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,7 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL LT_INIT -AC_SUBST([USER_CFLAGS], "$CFLAGS") -CFLAGS="-Wall -std=gnu99 -g -O2" +CFLAGS="$CFLAGS -Wall -std=gnu99" case $host_os in *cygwin*) @@ -33,13 +32,14 @@ case $host_os in ;; *hpux*) HOST_OS=hpux; - CFLAGS="$CFLAGS -mlp64 -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT" + CFLAGS="$CFLAGS -mlp64" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT" AC_SUBST([PLATFORM_LDADD], ['-lpthread']) ;; *linux*) HOST_OS=linux HOST_ABI=elf - CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" + CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" ;; *netbsd*) HOST_OS=netbsd @@ -50,14 +50,18 @@ case $host_os in ;; *mingw*) HOST_OS=win - CFLAGS="$CFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 -DOPENSSL_NO_SPEED -DNO_SYSLOG -D__USE_MINGW_ANSI_STDIO -static-libgcc" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO" + CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" + CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" + CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SPEED -DNO_SYSLOG" + CFLAGS="$CFLAGS -static-libgcc" LDFLAGS="$LDFLAGS -static-libgcc" AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) ;; *solaris*) HOST_OS=solaris HOST_ABI=elf - CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" + CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket']) ;; *) ;; @@ -294,7 +298,7 @@ AC_ARG_ENABLE([extratests], AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes]) old_cflags=$CFLAGS -CFLAGS="$USER_CFLAGS -I$srcdir/include" +CFLAGS="$CFLAGS -I$srcdir/include" AC_MSG_CHECKING([if BSWAP4 builds without __STRICT_ALIGNMENT]) AC_TRY_COMPILE([#include "$srcdir/crypto/modes/modes_lcl.h"], [int a = 0; BSWAP4(a);], @@ -306,11 +310,11 @@ CFLAGS="$old_cflags" case $host_cpu in *sparc*) - CFLAGS="$CFLAGS -D__STRICT_ALIGNMENT" + CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT" ;; *arm*) AS_IF([test "x$BSWAP4" = "xyes"],, - CFLAGS="$CFLAGS -D__STRICT_ALIGNMENT") + CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT") ;; esac diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 5861a55..e350cda 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 -AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp -AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes +AM_CFLAGS += -I$(top_srcdir)/crypto/asn1 +AM_CFLAGS += -I$(top_srcdir)/crypto/evp +AM_CFLAGS += -I$(top_srcdir)/crypto/modes lib_LTLIBRARIES = libcrypto.la @@ -10,13 +10,12 @@ EXTRA_DIST = VERSION libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la -libcrypto_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) -libcrypto_la_CFLAGS += -DOPENSSL_NO_HW_PADLOCK +libcrypto_la_CPPFLAGS = -DOPENSSL_NO_HW_PADLOCK if OPENSSL_NO_ASM -libcrypto_la_CFLAGS += -DOPENSSL_NO_ASM +libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM else if HOST_WIN -libcrypto_la_CFLAGS += -DOPENSSL_NO_ASM +libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM endif endif @@ -31,7 +30,6 @@ libcompatnoopt_la_SOURCES += compat/explicit_bzero.c endif # other compatibility functions -libcompat_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) libcompat_la_SOURCES = libcompat_la_LIBADD = $(PLATFORM_LDADD) diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index 6257c40..44e08a1 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -22,20 +22,20 @@ ASM_X86_64_ELF += cpuid-elf-x86_64.S EXTRA_DIST += $(ASM_X86_64_ELF) if HOST_ASM_ELF_X86_64 -libcrypto_la_CFLAGS += -DAES_ASM -libcrypto_la_CFLAGS += -DBSAES_ASM -libcrypto_la_CFLAGS += -DVPAES_ASM -libcrypto_la_CFLAGS += -DOPENSSL_IA32_SSE2 -libcrypto_la_CFLAGS += -DOPENSSL_BN_ASM_MONT -libcrypto_la_CFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CFLAGS += -DOPENSSL_BN_ASM_GF2m -libcrypto_la_CFLAGS += -DMD5_ASM -libcrypto_la_CFLAGS += -DGHASH_ASM -libcrypto_la_CFLAGS += -DRSA_ASM -libcrypto_la_CFLAGS += -DSHA1_ASM -libcrypto_la_CFLAGS += -DSHA256_ASM -libcrypto_la_CFLAGS += -DSHA512_ASM -libcrypto_la_CFLAGS += -DWHIRLPOOL_ASM -libcrypto_la_CFLAGS += -DOPENSSL_CPUID_OBJ +libcrypto_la_CPPFLAGS += -DAES_ASM +libcrypto_la_CPPFLAGS += -DBSAES_ASM +libcrypto_la_CPPFLAGS += -DVPAES_ASM +libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 +libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT +libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 +libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m +libcrypto_la_CPPFLAGS += -DMD5_ASM +libcrypto_la_CPPFLAGS += -DGHASH_ASM +libcrypto_la_CPPFLAGS += -DRSA_ASM +libcrypto_la_CPPFLAGS += -DSHA1_ASM +libcrypto_la_CPPFLAGS += -DSHA256_ASM +libcrypto_la_CPPFLAGS += -DSHA512_ASM +libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM +libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ libcrypto_la_SOURCES += $(ASM_X86_64_ELF) endif diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index e361aae..bc2aaad 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -22,20 +22,20 @@ ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S EXTRA_DIST += $(ASM_X86_64_MACOSX) if HOST_ASM_MACOSX_X86_64 -libcrypto_la_CFLAGS += -DAES_ASM -libcrypto_la_CFLAGS += -DBSAES_ASM -libcrypto_la_CFLAGS += -DVPAES_ASM -libcrypto_la_CFLAGS += -DOPENSSL_IA32_SSE2 -libcrypto_la_CFLAGS += -DOPENSSL_BN_ASM_MONT -libcrypto_la_CFLAGS += -DOPENSSL_BN_ASM_MONT5 -libcrypto_la_CFLAGS += -DOPENSSL_BN_ASM_GF2m -libcrypto_la_CFLAGS += -DMD5_ASM -libcrypto_la_CFLAGS += -DGHASH_ASM -libcrypto_la_CFLAGS += -DRSA_ASM -libcrypto_la_CFLAGS += -DSHA1_ASM -libcrypto_la_CFLAGS += -DSHA256_ASM -libcrypto_la_CFLAGS += -DSHA512_ASM -libcrypto_la_CFLAGS += -DWHIRLPOOL_ASM -libcrypto_la_CFLAGS += -DOPENSSL_CPUID_OBJ +libcrypto_la_CPPFLAGS += -DAES_ASM +libcrypto_la_CPPFLAGS += -DBSAES_ASM +libcrypto_la_CPPFLAGS += -DVPAES_ASM +libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2 +libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT +libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5 +libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m +libcrypto_la_CPPFLAGS += -DMD5_ASM +libcrypto_la_CPPFLAGS += -DGHASH_ASM +libcrypto_la_CPPFLAGS += -DRSA_ASM +libcrypto_la_CPPFLAGS += -DSHA1_ASM +libcrypto_la_CPPFLAGS += -DSHA256_ASM +libcrypto_la_CPPFLAGS += -DSHA512_ASM +libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM +libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) endif diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 7d66795..db60775 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -5,7 +5,6 @@ lib_LTLIBRARIES = libssl.la EXTRA_DIST = VERSION libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) libssl_la_LIBADD = ../crypto/libcrypto.la libssl_la_SOURCES = bio_ssl.c diff --git a/tls/Makefile.am b/tls/Makefile.am index e82a694..e8c4713 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am @@ -5,7 +5,6 @@ lib_LTLIBRARIES = libtls.la EXTRA_DIST = VERSION libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -libtls_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) libtls_la_LIBADD = ../crypto/libcrypto.la ../ssl/libssl.la $(PLATFORM_LDADD) libtls_la_SOURCES = tls.c -- cgit v1.2.3-55-g6feb