From 5ea5cdb892ec21cd3de9ada79e2cbbc3d2bc47e8 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 20 Apr 2024 10:36:29 +0900 Subject: [PATCH 1/5] fix .github/workflows/config.yml: cleanup docker bash script of deban-unstable for further commit --- .github/workflows/config.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index afd0f6886..3a4572d0b 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -123,7 +123,14 @@ jobs: sudo apt install -y -qq qemu binfmt-support qemu-user-static; \ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; \ fi - docker run --rm -v $(pwd):/ws/euslisp -e "ARCH=$ARCH" -t "$DOCKER_IMAGE" bash -c "set -x; set -e; apt update -qq; apt install -y -qq make gcc libgl-dev libglu1-mesa-dev libjpeg-dev libpng-dev libpq-dev libx11-dev libxext-dev; ARCH=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/ -f Makefile.$ARCH eus0; CC='gcc -Werror' ARCHDIR=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/image/jpeg; exit 0" + docker run --rm -v $(pwd):/ws/euslisp -e "ARCH=$ARCH" -t "$DOCKER_IMAGE" \ + bash -c " \ + set -x; set -e; \ + apt update -qq; \ + apt install -y -qq make gcc libgl-dev libglu1-mesa-dev libjpeg-dev libpng-dev libpq-dev libx11-dev libxext-dev; \ + ARCH=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/ -f Makefile.$ARCH eus0; \ + CC='gcc -Werror' ARCHDIR=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/image/jpeg; \ + exit 0" osx: runs-on: macos-latest From 31b8597763d13a848a10ddbcc1f141b55f9d3249 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 20 Apr 2024 12:46:02 +0900 Subject: [PATCH 2/5] .github/workflows/config.yml: debian-unstable add x390s/riscv64 --- .github/workflows/config.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 3a4572d0b..523f7d117 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -102,6 +102,10 @@ jobs: ARCH: LinuxARM - DOCKER_IMAGE: arm64v8/debian:unstable-slim ARCH: LinuxARM + - DOCKER_IMAGE: s390x/debian:unstable-slim + ARCH: Linux + - DOCKER_IMAGE: riscv64/debian:unstable-slim + ARCH: Linux runs-on: ubuntu-latest timeout-minutes: 60 @@ -119,10 +123,8 @@ jobs: sudo apt update -qq # Install the qemu packages # This step will execute the registering scripts - if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then \ - sudo apt install -y -qq qemu binfmt-support qemu-user-static; \ - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; \ - fi + sudo apt install -y -qq qemu binfmt-support qemu-user-static + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker run --rm -v $(pwd):/ws/euslisp -e "ARCH=$ARCH" -t "$DOCKER_IMAGE" \ bash -c " \ set -x; set -e; \ From 657492a9b9a0e69e0c2615f18a59823bce5dfd36 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 20 Apr 2024 12:46:42 +0900 Subject: [PATCH 3/5] .github/workflows/config.yml: debian-unstable add CFLAGS='-Werror=implicit-function-declaration' --- .github/workflows/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 523f7d117..0c941c2a5 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -130,7 +130,7 @@ jobs: set -x; set -e; \ apt update -qq; \ apt install -y -qq make gcc libgl-dev libglu1-mesa-dev libjpeg-dev libpng-dev libpq-dev libx11-dev libxext-dev; \ - ARCH=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/ -f Makefile.$ARCH eus0; \ + CFLAGS='-Werror=implicit-function-declaration' ARCH=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/ -f Makefile.$ARCH eus0; \ CC='gcc -Werror' ARCHDIR=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/image/jpeg; \ exit 0" From d86ed0d7a778407f026047a813174da6862d029b Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 19 Apr 2024 21:03:21 +0900 Subject: [PATCH 4/5] lisp/Makefile.Linux: fix regression, set MACHINE if not defined --- lisp/Makefile.Linux | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lisp/Makefile.Linux b/lisp/Makefile.Linux index 0689d83de..e54a713e6 100644 --- a/lisp/Makefile.Linux +++ b/lisp/Makefile.Linux @@ -59,22 +59,21 @@ $(info "-- GCC_MACHINE = ${GCC_MACHINE}") ifneq ($(GCC_MACHINE),) ifneq (,$(findstring x86_64-linux-gnu,$(GCC_MACHINE))) MACHINE=x86_64 - endif - ifneq (,$(findstring i686-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring i686-linux-gnu,$(GCC_MACHINE))) MACHINE=i686 - endif - ifneq (,$(findstring aarch64-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring aarch64-linux-gnu,$(GCC_MACHINE))) MACHINE=aarch64 - endif - ifneq (,$(findstring arm-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring arm-linux-gnu,$(GCC_MACHINE))) MACHINE=arm - endif - ifneq (,$(findstring powerpc64le-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring powerpc64le-linux-gnu,$(GCC_MACHINE))) MACHINE=ppc64le - endif - ifneq (,$(findstring mips64el-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring mips64el-linux-gnu,$(GCC_MACHINE))) MACHINE=mips64 + else + MACHINE=$(subst -linux-gnu,,$(GCC_MACHINE)) endif +else + MACHINE=$(shell uname -m) endif # need to set 'i486', for conditionals in c/*.[ch]. ifneq ($(shell gcc -dumpmachine | grep "i.*86-linux"),) From cfe36bfc0200fedb4bfaae2574d8c8cfa31c26c0 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 20 Apr 2024 18:05:48 +0900 Subject: [PATCH 5/5] skip patch in upstream, https://github.com/euslisp/EusLisp/pull/512, https://github.com/euslisp/EusLisp/pull/514 (https://salsa.debian.org/science-team/euslisp/-/commit/236b3a5fa3967e444a29cacf6b100c519208205e) --- .travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.sh b/.travis.sh index a41e657d2..95cc57cca 100755 --- a/.travis.sh +++ b/.travis.sh @@ -96,8 +96,8 @@ if [[ "$QEMU" != "" ]]; then git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do # skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511 - [[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch ]] && continue; - # skip patch already applied by https://github.com/euslisp/EusLisp/pull/441, https://github.com/euslisp/EusLisp/pull/509 + [[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch ]] && continue; + # skip patch already applied by https://github.com/euslisp/EusLisp/pull/441, https://github.com/euslisp/EusLisp/pull/509, https://github.com/euslisp/EusLisp/pull/512, https://github.com/euslisp/EusLisp/pull/514 if [[ $file =~ fix-for-reprotest.patch ]]; then filterdiff -p1 -x 'lisp/image/jpeg/makefile' -x 'lisp/comp/comp.l' < /tmp/euslisp-dfsg/debian/patches/$file > /tmp/euslisp-dfsg/debian/patches/$file-fix file=$file-fix