From d747868a8b1a5d43198f7946c5d33b58e44f9890 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 5 Mar 2020 20:29:21 +0900 Subject: [PATCH 1/3] use DOCEKR_IMAGE=arm64v8/debian:unstable --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 699fab003..b12152fbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: - env: DOCKER_IMAGE=debian:stretch - env: DOCKER_IMAGE=osrf/debian_arm64:stretch - env: QEMU=amd64 DOCKER_IMAGE=amd64/debian:unstable # amd64 - - env: QEMU=aarch64 DOCKER_IMAGE=arm64v8/debian:buster # arm64 + - env: QEMU=aarch64 DOCKER_IMAGE=arm64v8/debian:unstable # arm64 - env: QEMU=arm DOCKER_IMAGE=arm32v5/debian:jessie # armel - env: QEMU=arm DOCKER_IMAGE=arm32v7/debian:jessie # armhf # hppa From 390d7e853cb05f20cfa19dd3955d4d7160cadbe1 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 5 Mar 2020 21:50:31 +0900 Subject: [PATCH 2/3] fix ADD_LDFLAGS respect originall ADD_LDFLAGS, whcih gives --no-as-needed --- lisp/Makefile.Linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/Makefile.Linux b/lisp/Makefile.Linux index f243c41f2..5c564816f 100644 --- a/lisp/Makefile.Linux +++ b/lisp/Makefile.Linux @@ -74,7 +74,7 @@ CFLAGS:= $(CFLAGS) $(CPPFLAGS) $(WFLAGS) -D$(MACHINE) -DLinux -D_REENTRANT -DVER # machine specific CFLAGS ifneq ($(shell gcc -dumpmachine | egrep "^(arm|aarch)"),) - ADD_LDFLAGS=-Wl,-z,execstack + ADD_LDFLAGS+=-Wl,-z,execstack CFLAGS+=-DARM -fPIC ARCH=LinuxARM endif From 37e6d634f8d1da5b5b0fa70022de27cb7bde2d03 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 7 Mar 2020 00:25:35 +0900 Subject: [PATCH 3/3] use sid for armel/armhf --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b12152fbc..9accfdfed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ matrix: - env: DOCKER_IMAGE=osrf/debian_arm64:stretch - env: QEMU=amd64 DOCKER_IMAGE=amd64/debian:unstable # amd64 - env: QEMU=aarch64 DOCKER_IMAGE=arm64v8/debian:unstable # arm64 - - env: QEMU=arm DOCKER_IMAGE=arm32v5/debian:jessie # armel - - env: QEMU=arm DOCKER_IMAGE=arm32v7/debian:jessie # armhf + - env: QEMU=arm DOCKER_IMAGE=arm32v5/debian:unstable # armel + - env: QEMU=arm DOCKER_IMAGE=arm32v7/debian:unstable # armhf # hppa # hurd-i386 - env: QEMU=i386 DOCKER_IMAGE=i386/debian:unstable # i386