From 3d4dd3ab193fb283ae3b6f3f92526a1218b5729f Mon Sep 17 00:00:00 2001
From: jmd <jmd@FreeBSD.org>
Date: Fri, 9 Feb 2018 04:33:16 +0000
Subject: java/aparapi: fix recent LLVM6 fallout caused by the switch to
 default to C++14. As development of aparapi at the location referenced by the
 port as slowed down, set C++ standard explicitly in the internal Makefile.
 Ultimately, an upgrade to the more active development location is planned.

Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
MFH:		2018Q1
Differential Revision:	https://reviews.freebsd.org/D14278
---
 java/aparapi/Makefile                                  |  3 ++-
 java/aparapi/files/patch-com.amd.aparapi.jni_build.xml | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'java')

diff --git a/java/aparapi/Makefile b/java/aparapi/Makefile
index b00a3f730a45..de225ad655f5 100644
--- a/java/aparapi/Makefile
+++ b/java/aparapi/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	aparapi
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-SNAPSHOT
 CATEGORIES=	java lang
 
-MAINTAINER=	dieterich@ogolem.org
+MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Open source API for expressing data parallel workflows in Java
 
 LICENSE=	BSD3CLAUSE
diff --git a/java/aparapi/files/patch-com.amd.aparapi.jni_build.xml b/java/aparapi/files/patch-com.amd.aparapi.jni_build.xml
index 1926d39abaa4..8204d6c3e1e3 100644
--- a/java/aparapi/files/patch-com.amd.aparapi.jni_build.xml
+++ b/java/aparapi/files/patch-com.amd.aparapi.jni_build.xml
@@ -1,6 +1,6 @@
---- com.amd.aparapi.jni/build.xml.orig	2015-09-21 01:20:25 UTC
+--- com.amd.aparapi.jni/build.xml.orig	2018-01-22 14:48:34 UTC
 +++ com.amd.aparapi.jni/build.xml
-@@ -71,6 +71,23 @@ First consider editing the properties in
+@@ -71,6 +71,23 @@ First consider editing the properties in build.propert
           </and>
        </condition>
  
@@ -24,7 +24,7 @@
        <echo message="amd.app.sdk.dir ${amd.app.sdk.dir}"/>
  
  	  <!-- Check for Visual Studio Compiler -->
-@@ -300,9 +317,16 @@ First consider editing the properties in
+@@ -300,9 +317,16 @@ First consider editing the properties in build.propert
              <not>
                 <os family="mac" />
              </not>
@@ -41,7 +41,7 @@
        <condition property="use.gcc_mac">
           <os family="mac" />
        </condition>
-@@ -352,6 +376,9 @@ First consider editing the properties in
+@@ -352,6 +376,9 @@ First consider editing the properties in build.propert
                    <os family="mac" />
                 </not>
                 <not>
@@ -51,7 +51,7 @@
                    <isset property="amd.app.sdk.dir" />
                 </not>
              </and>
-@@ -485,6 +512,45 @@ First consider editing the properties in
+@@ -485,6 +512,46 @@ First consider editing the properties in build.propert
        </exec>
     </target>
  
@@ -60,6 +60,7 @@
 +      <echo message="freebsdcc ${os.arch}" />
 +      <exec executable="clang++" failonerror="true">
 +         <arg value="-m${gcc.m.value}" />
++         <arg value="-std=gnu++98" />
 +         <arg value="-O3" />
 +         <arg value="-g" />
 +         <arg value="-fPIC" />
@@ -97,7 +98,7 @@
     <target name="gcc_mac" if="use.gcc_mac">
        <mkdir dir="${basedir}/dist"/>
        <echo message="gcc ${os.arch}" />
-@@ -575,7 +641,7 @@ First consider editing the properties in
+@@ -575,7 +642,7 @@ First consider editing the properties in build.propert
        </exec>
     </target>
  
@@ -106,7 +107,7 @@
  
     <target name="msvc_cltest" if="use.msvc">
        <mkdir dir="${basedir}\dist"/>
-@@ -627,6 +693,24 @@ First consider editing the properties in
+@@ -627,6 +694,24 @@ First consider editing the properties in build.propert
        </exec>
     </target>
  
@@ -131,7 +132,7 @@
     <target name="gcc_cltest" if="use.gcc">
        <mkdir dir="${basedir}/dist"/>
        <echo message="gcc cltest ${os.arch}" />
-@@ -674,6 +758,20 @@ First consider editing the properties in
+@@ -674,6 +759,20 @@ First consider editing the properties in build.propert
        </exec>
     </target>
  
-- 
cgit