From d8da003868abea7d6293009ceab3316974b12c10 Mon Sep 17 00:00:00 2001 From: Daniel Llewellyn Date: Sun, 8 Nov 2020 16:58:07 +0000 Subject: [PATCH 1/2] Fix Buildtime Race Condition The `mv` in `SuperBuild` for `lasmerge` will copy `lasmerge` to a file called `SuperBuild/install/bin` **not** `SuperBuild/install/bin/lasmerge` when the `bin` folder has not been created. This is the case when building with 2 jobs (`-j2`) so builds fail when moving onto OpenCV which requires that `bin` be a directory. * Change `mv` to more reliable `install` command for `lasmerge`. Signed-off-by: Daniel Llewellyn --- SuperBuild/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index da10a6eb..e86d2700 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -159,5 +159,5 @@ externalproject_add(lastools UPDATE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND make -C LASlib -j${nproc} CXXFLAGS='-std=c++11' && make -C src -j${nproc} CXXFLAGS='-std=c++11' lasmerge - INSTALL_COMMAND mv ${SB_SOURCE_DIR}/lastools/bin/lasmerge ${SB_INSTALL_DIR}/bin + INSTALL_COMMAND install -m755 -D -t ${SB_INSTALL_DIR}/bin ${SB_SOURCE_DIR}/lastools/bin/lasmerge ) From 01057ce051b2b463846244b744f9edcb210a3ee3 Mon Sep 17 00:00:00 2001 From: Daniel Llewellyn Date: Sun, 8 Nov 2020 17:45:13 +0000 Subject: [PATCH 2/2] Remove 386 from Docker Builds for Ubuntu 20.04 Ubuntu 20.04 no-longer includes 386 binary support. * Remove 386 from Docker builds Signed-off-by: Daniel Llewellyn --- .github/workflows/build-container-and-wsl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-container-and-wsl.yaml b/.github/workflows/build-container-and-wsl.yaml index 7f5fe052..7bc2e226 100644 --- a/.github/workflows/build-container-and-wsl.yaml +++ b/.github/workflows/build-container-and-wsl.yaml @@ -32,7 +32,7 @@ jobs: uses: docker/build-push-action@v2 with: file: ./portable.Dockerfile - platforms: linux/amd64,linux/386 + platforms: linux/amd64 push: true load: true # Copy to the host's docker daemon so we can use it for WSL export tags: ${{ steps.docker_meta.outputs.tags }}