[patch] Copies cl.hpp for each version if available on src_install;Creates unversioned CL simlink to CL-1.2;

eselect-opencl-links-and-hpp.epatch (text/plain), 4.98 KB, created by Amaroun on 2017-02-06 12:41:48 UTC

diff -Nurb a/eselect-opencl-1.1.0-r4.ebuild b/eselect-opencl-1.1.0-r4.ebuild
--- a/eselect-opencl-1.1.0-r4.ebuild	2017-02-06 13:10:40.938459630 +0100
+++ b/eselect-opencl-1.1.0-r4.ebuild	2017-02-06 13:09:41.932457515 +0100
@@ -20,15 +20,18 @@
 
 # Using copy by Mario Kicherer #496418
 
+CL_ABIS=(1.0 1.1 1.2 2.0 2.1)
+
 SRC_URI="
 	https://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip
 	http://packages.gentooexperimental.org/opencl-cpp-headers.tar
 	"
+
+for CL_ABI in "${CL_ABIS[@]}" ; do
+	SRC_URI="${SRC_URI} https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl${CL_ABI/./}.zip"
+done
+
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
@@ -52,18 +55,22 @@
 	local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_egl.h )
 
 	# We install all versions of OpenCL headers
-	for CL_ABI in 1.0 1.1 1.2 2.0 2.1; do
+	for CL_ABI in "${CL_ABIS[@]}" ; do
 		mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
 		for f in ${headers[@]}; do
-			cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}" > /dev/null
-		done
+			if [ -r "${WORKDIR}/OpenCL-Headers-opencl${CL_ABI/./}/${f}" ] ; then
+				cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}"
+			fi
 	done
 
-	for i in 1.1 1.2 2.1; do
-		cp "${WORKDIR}"/$i/cl.hpp "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+		if [ -r "${WORKDIR}/${CL_ABI}/cl.hpp" ] ; then
+			cp "${WORKDIR}/${CL_ABI}/cl.hpp" "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+			einfo "${WORKDIR}/${CL_ABI}/cl.hpp copied to ${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+		else
+			einfo "${WORKDIR}/${CL_ABI}/cl.hpp does not exist"
+		fi
 	done
+
 	# Create symlinks to newest. Maybe this should be switchable?
-	for f in ${headers[@]}; do
-		dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/${f}" "/usr/include/CL/${f}"
-	done
+	dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/" "/usr/$(get_libdir)/OpenCL/global/include/CL"
 }
diff -Nurb a/eselect-opencl-1.1.0-r4.ebuild b/eselect-opencl-1.1.0-r4.ebuild
--- a/eselect-opencl-1.1.0-r4.ebuild	2017-02-06 13:10:40.938459630 +0100
+++ b/eselect-opencl-1.1.0-r4.ebuild	2017-02-06 13:37:02.725516315 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit multilib
 
@@ -20,15 +20,18 @@
 
 # Using copy by Mario Kicherer #496418
 
+CL_ABIS=(1.0 1.1 1.2 2.0 2.1)
+
 SRC_URI="
 	https://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip
-	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip
 	http://packages.gentooexperimental.org/opencl-cpp-headers.tar
 	"
+
+for CL_ABI in "${CL_ABIS[@]}" ; do
+	SRC_URI="${SRC_URI} https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl${CL_ABI/./}.zip"
+done
+
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
@@ -52,18 +55,22 @@
 	local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_egl.h )
 
 	# We install all versions of OpenCL headers
-	for CL_ABI in 1.0 1.1 1.2 2.0 2.1; do
+	for CL_ABI in "${CL_ABIS[@]}" ; do
 		mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
 		for f in ${headers[@]}; do
-			cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}" > /dev/null
-		done
+			if [ -r "${WORKDIR}/OpenCL-Headers-opencl${CL_ABI/./}/${f}" ] ; then
+				cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}"
+			fi
 	done
 
-	for i in 1.1 1.2 2.1; do
-		cp "${WORKDIR}"/$i/cl.hpp "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+		if [ -r "${WORKDIR}/${CL_ABI}/cl.hpp" ] ; then
+			cp "${WORKDIR}/${CL_ABI}/cl.hpp" "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+			einfo "${WORKDIR}/${CL_ABI}/cl.hpp copied to ${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+		else
+			einfo "${WORKDIR}/${CL_ABI}/cl.hpp does not exist"
+		fi
 	done
+
 	# Create symlinks to newest. Maybe this should be switchable?
-	for f in ${headers[@]}; do
-		dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/${f}" "/usr/include/CL/${f}"
-	done
+	dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/" "/usr/$(get_libdir)/OpenCL/global/include/CL"
 }