From 0524fd815687356098498008be802bc8cd46314c Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sun, 15 Dec 2019 22:38:53 +0100
Subject: [PATCH] Fixed build for 32bit builds.
---
Dockerfile | 2 +-
build.sh | 1 +
docker-compose.yml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1543ade..fe90632 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:8
-RUN set -ex && apt-get update && apt-get upgrade -y && apt-get install -y build-essential ocl-icd-opencl-dev libtool autoconf autotools-dev automake maven --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN set -ex && apt-get update && apt-get upgrade -y && apt-get install -y build-essential ocl-icd-opencl-dev libtool autoconf autotools-dev automake maven gcc-multilib g++-multilib --no-install-recommends && dpkg --add-architecture i386 && apt-get update && apt-get install -y ocl-icd-opencl-dev:i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*
COPY . /usr/src/app
WORKDIR /usr/src/app
diff --git a/build.sh b/build.sh
index 64b5243..11c26f9 100755
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,7 @@ automake --add-missing
./configure
make
mv .libs .libs64
+make clean
./configure --build=i686-pc-linux-gnu "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"
make
mv .libs .libs32
diff --git a/docker-compose.yml b/docker-compose.yml
index bd4226f..764fe9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
aparapi_native_builder:
container_name: aparapi_native_builder
- image: 'aparapi/aparapi-native-builder'
+ image: 'aparapi/aparapi-native-builder:latest'
build:
context: .
user: "$UID:$GID"
--
GitLab