From 0fcf4dd9c3f90fee4d0e378e124d0fbdd7ba4953 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Mon, 15 Feb 2021 10:29:08 -0500
Subject: [PATCH] Got the darwin crosscompiler using clang now, still not
working.
---
Dockerfile | 13 -------------
buildDarwin.sh | 18 ++++++++++++++++++
configure.ac | 10 +++++++++-
3 files changed, 27 insertions(+), 14 deletions(-)
create mode 100755 buildDarwin.sh
diff --git a/Dockerfile b/Dockerfile
index ac1298c..0060d04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,5 @@ FROM aparapi/opencl-cross-compiler
LABEL maintainer="Jeffrey Phillips Freeman the@jeffreyfreeman.me"
-RUN cd /usr/src && \
- unzip /root/openjdk/windows64/openlogic-openjdk-8u272-b10-windows-x64.zip && \
- cp -av /root/OpenCL_* /usr/src && \
- cd /usr/src/OpenCL_ARM/aarch64 && \
- ln -s libOpenCL.so.1.0.0 libOpenCL.so && \
- cd /usr/src/OpenCL_ARM/armhf && \
- ln -s libOpenCL.so.1.0.0 libOpenCL.so && \
- cp -av /root/msys2-OpenCL-headers /usr/src && \
- rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
# run in shell mode with ENV expansion
CMD rm -rf .libs .libs32 .libs64 && ./buildMingW.sh && ./build.sh && ./buildArmLinux.sh
diff --git a/buildDarwin.sh b/buildDarwin.sh
new file mode 100755
index 0000000..b424280
--- /dev/null
+++ b/buildDarwin.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+echo "Aparapi Darwin (OSX) x86_64 compilation started..."
+
+export PATH=/usr/osxcross/bin:/usr/osxcross:$PATH
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre
+rm -rf .libs64/linux .libs32/linux
+make clean
+./prepare.sh
+
+export JAVA_HOME=/usr/src/openlogic-openjdk-8u272-b10-mac-x64/jdk1.8.0_272.jdk/Contents/Home
+libtoolize
+aclocal
+autoconf
+automake --add-missing
+./configure --host=x86_64-apple-darwin
+make
+mkdir -p .libs64
+mv .libs .libs64/linux
diff --git a/configure.ac b/configure.ac
index 23b313b..bcdfcd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,17 @@
-AC_INIT([libaparapi], [1.4.2], [syncleus@syncleus.com])
+AC_INIT([libaparapi], [1.4.3], [syncleus@syncleus.com])
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
AC_CONFIG_MACRO_DIRS([m4])
LT_INIT
AM_INIT_AUTOMAKE([subdir-objects])
+
+case $host_os in
+ darwin* )
+ CC=${CC-/usr/osxcross/bin/x86_64-apple-darwin14-clang}
+ CXX=${CXX-/usr/osxcross/bin/x86_64-apple-darwin14-clang++}
+ ;;
+esac
+
AC_PROG_CXX
AC_CONFIG_FILES([Makefile])
AC_CANONICAL_HOST
--
GitLab