From ad3e45aff18fd991dddff4b7c48fe5f442464ca7 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 12 Jul 2018 11:03:42 +0900 Subject: [PATCH 1/2] disable linux test --- .travis.yml | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1ad9005c..4fce41c63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,46 +1,46 @@ # Travis Continuous Integration Configuration File matrix: include: - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=ubuntu:trusty - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=ubuntu:xenial - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=osrf/ubuntu_armhf:trusty - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=osrf/ubuntu_armhf:xenial - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=osrf/ubuntu_arm64:trusty - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=osrf/ubuntu_arm64:xenial - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=debian:jessie - - os: linux - dist: trusty - sudo: required - cache: apt - env: DOCKER_IMAGE=osrf/debian_arm64:jessie + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=ubuntu:trusty + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=ubuntu:xenial + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=osrf/ubuntu_armhf:trusty + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=osrf/ubuntu_armhf:xenial + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=osrf/ubuntu_arm64:trusty + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=osrf/ubuntu_arm64:xenial + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=debian:jessie + # - os: linux + # dist: trusty + # sudo: required + # cache: apt + # env: DOCKER_IMAGE=osrf/debian_arm64:jessie - os: osx env: global: From 7c7eee66064ac69f0c39cb08913ff3b1764a2f00 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 12 Jul 2018 11:04:25 +0900 Subject: [PATCH 2/2] add -Wno-comment to CFLAGS --- lisp/Makefile.Darwin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/Makefile.Darwin b/lisp/Makefile.Darwin index df7814f41..5300428a1 100644 --- a/lisp/Makefile.Darwin +++ b/lisp/Makefile.Darwin @@ -53,7 +53,7 @@ DEBUG= -g # If you use libc.so.5, remove -DLIB6 option. # In order to include thread library, libc.so.6 is preferrable. -CFLAGS=-D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \ +CFLAGS=-Wno-comment -D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \ -DLIB6 $(ALIGN_FUNCTIONS) \ $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \ -DGCC $(GCC3) \