arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test Travis Xenial build 

I can't test on my fork at the moment because it is tied up with some other changes. Also see https://blog.travis-ci.com/2018-11-08-xenial-release.
pull/757/head
Jeffrey Walton 2018-12-04 11:05:16 -05:00
parent 482151a980
commit cdefa5befe
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -4,7 +4,7 @@ os:
- linux - linux
- osx - osx
dist: trusty dist: xenial
sudo: required sudo: required
# OS X only supports one image. Use the latest. # OS X only supports one image. Use the latest.

38
GNUmakefile
View File

@ -801,10 +801,12 @@ ifeq ($(IS_SUN)$(SUN_COMPILER),11)
endif # X86/X32/X64 endif # X86/X32/X64
endif # SunOS endif # SunOS
# TODO: can we remove this since removing sockets?
ifneq ($(IS_MINGW),0) ifneq ($(IS_MINGW),0)
LDLIBS += -lws2_32 LDLIBS += -lws2_32
endif endif
# TODO: can we remove this since removing sockets?
ifneq ($(IS_SUN),0) ifneq ($(IS_SUN),0)
LDLIBS += -lnsl -lsocket LDLIBS += -lnsl -lsocket
endif endif
@ -834,20 +836,36 @@ endif
# No ASM for Travis testing # No ASM for Travis testing
ifeq ($(findstring no-asm,$(MAKECMDGOALS)),no-asm) ifeq ($(findstring no-asm,$(MAKECMDGOALS)),no-asm)
ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),) ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),)
CXXFLAGS += -DCRYPTOPP_DISABLE_ASM CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
endif # CXXFLAGS endif # CXXFLAGS
endif # No ASM endif # No ASM
# Native build testing. Issue 'make native'. # Native build testing. Issue 'make native'.
ifeq ($(findstring native,$(MAKECMDGOALS)),native) ifeq ($(findstring native,$(MAKECMDGOALS)),native)
ifeq ($(findstring -march=native,$(CXXFLAGS)),) NATIVE_OPT =
ifeq ($(IS_SUN)$(SUN_COMPILER),11)
CXXFLAGS += -native # Try GCC and compatibles first
else TPROG = TestPrograms/test_cxx.cxx
CXXFLAGS += -march=native TOPT = -march=native
endif # CXXFLAGS HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
endif # Sun ifeq ($(strip $(HAVE_OPT)),0)
NATIVE_OPT = -march=native
endif # NATIVE_OPT
# Try SunCC next
ifeq ($(NATIVE_OPT),)
TOPT = -native
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(strip $(HAVE_OPT)),0)
NATIVE_OPT = -native
endif # NATIVE_OPT
endif
ifneq ($(NATIVE_OPT),)
CXXFLAGS += $(NATIVE_OPT)
endif
endif # Native endif # Native
# Undefined Behavior Sanitizer (UBsan) testing. Issue 'make ubsan'. # Undefined Behavior Sanitizer (UBsan) testing. Issue 'make ubsan'.