Attachment 174353 Details for Bug 171914 – pocl.diff (new port as diff as recommended by porter's handbook)

[patch] pocl.diff (new port as diff as recommended by porter's handbook)

pocl.diff (text/plain), 10.32 KB, created by O. Hartmann on 2016-09-03 19:20:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: O. Hartmann

Created: 2016-09-03 19:20:24 UTC

Size: 10.32 KB

patch

obsolete

>Index: pocl/Makefile
>===================================================================
>--- pocl/Makefile	(nonexistent)
>+++ pocl/Makefile	(working copy)
>@@ -0,0 +1,80 @@
>+# $FreeBSD$
>+
>+PORTNAME=		pocl
>+PORTVERSION=	0.13
>+CATEGORIES=		devel
>+
>+MAINTAINER=		ohartman@zedat.fu-berlin.de
>+COMMENT=		POrtable Computing Language (POCL)
>+
>+MASTER_SITES=	SF
>+MASTER_SITE_SUBDIR=	pocl/
>+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.[0-9]$//}
>+
>+LICENSE=		GPLv3
>+LICENSE_FILE=		${WRKSRC}/LICENSE
>+
>+BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config:${PORTSDIR}/devel/llvm${LLVM_VERSION} \
>+			${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
>+RUN_DEPENDS=	${BUILD_DEPENDS}
>+RUN_DEPENDS=	${BUILD_DEPENDS}
>+
>+LIB_DEPENDS=	libhwloc.so:${PORTSDIR}/devel/hwloc
>+
>+CONFLICTS=		freeocl[0-9]*
>+
>+NOT_FOR_ARCHS= 	i386
>+
>+LLVM_VERSION=	38
>+CLANG_VERSION=	${LLVM_VERSION}
>+
>+GNU_CONFIGURE=	yes
>+USE_LDCONFIG=	yes
>+USE_GL=			yes
>+USES=			autoreconf pkgconfig gmake pathfix libtool:keepla
>+
>+INSTALL_TARGET= install-strip
>+
>+MAKE_ARGS+=		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
>+
>+CPPFLAGS+=		-I${LOCALBASE}/include
>+LDFLAGS+=		-L${LOCALBASE}/lib
>+
>+CONFIGURE_ENV=	LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config"
>+CONFIGURE_ARGS= CLANGXX_FLAGS=-std=gnu++11
>+CONFIGURE_ENABLE= pedantic
>+
>+ALL_TARGET=	all
>+
>+OCL_ICD_VENDORS?=	${PREFIX}/etc/OpenCL/vendors
>+
>+OPTIONS_DEFINE=		HEADER DEBUG
>+
>+OPTIONS_GROUP=		TEST
>+OPTIONS_GROUP_TEST= OCLBOOK
>+
>+OPTIONS_SINGLE=		ICD
>+OPTIONS_SINGLE_ICD=	OCL_ICD NO_ICD
>+OPTIONS_DEFAULT=	OCL_ICD
>+
>+OCLBOOK_DESC=	Tests from the OpenCL book
>+DEBUG_DESC=		Debug build of pocl 
>+VIENNACL_DESC=	ViennaCL Test
>+OCL_ICD_DESC=	ICD loader: ocl-icd
>+NO_ICD_DESC=	No ICD loader (direct linkage against pocl lib)
>+HEADER_DESC=	Install CL headers from this port
>+
>+HEADER_CONFLICTS=	opencl
>+
>+HEADER_PKG_DEPENDS_OFF=	${LOCALBASE}/include/CL/cl.h:${PORTSDIR}/devel/opencl
>+
>+OCL_ICD_PKG_DEPENDS=	${LOCALBASE}/include/ocl_icd.h:${PORTSDIR}/devel/ocl-icd
>+ICD_CONFIGURE_ENABLE= 	tests-with-icd
>+NO_ICD_CONFIGURE_ENABLE= direct-linkage
>+
>+OCLBOOK_CONFIGURE_ENABLE= enable_testsuites="opencl-book-samples,cloverleaf,opencl_book_samples,halide,vexcl"
>+OCLBOOK_ALL_TARGET=	check
>+
>+DEBUG_CONFIGURE_ENABLE=	debug
>+
>+.include <bsd.port.mk>
>
>Property changes on: pocl/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/distinfo
>===================================================================
>--- pocl/distinfo	(nonexistent)
>+++ pocl/distinfo	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (pocl-0.13.tar.gz) = a17f37d8f26819c0c8efc6de2b57f67a0c8a81514fc9cd5005434e49d67499f9
>+SIZE (pocl-0.13.tar.gz) = 1901208
>
>Property changes on: pocl/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/files/patch-Makefile.am
>===================================================================
>--- pocl/files/patch-Makefile.am	(nonexistent)
>+++ pocl/files/patch-Makefile.am	(working copy)
>@@ -0,0 +1,23 @@
>+--- Makefile.am.orig	2014-01-07 09:50:56.000000000 +0100
>++++ Makefile.am	2014-06-20 17:07:10.000000000 +0200
>+@@ -26,7 +26,11 @@
>+ 
>+ ACLOCAL_AMFLAGS = -I m4
>+ 
>++if FREEBSD_HOST_OS
>++pkgconfigdir = $(PKGCONFIGDIR)
>++else
>+ pkgconfigdir = $(libdir)/pkgconfig
>++endif
>+ pkgconfig_DATA = pocl.pc
>+ 
>+ CLEANFILES = install-paths.h
>+@@ -67,7 +71,7 @@
>+ 	echo "#define PKGDATADIR \"${pkgdatadir}\"" > $@.new
>+ 	echo "#define PKGLIBEXECDIR \"${pkglibexecdir}\"" >> $@.new
>+ 	echo "#define PKGINCLUDEDIR \"${pkgincludedir}\"" >> $@.new
>+-	@if cmp --quiet $@.new $@ ; then \
>++	@if cmp $@.new $@ ; then \
>+ 		: "Paths not changed" ;\
>+ 		$(RM) $@.new ;\
>+ 	else \
>
>Property changes on: pocl/files/patch-Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/files/patch-configure.ac
>===================================================================
>--- pocl/files/patch-configure.ac	(nonexistent)
>+++ pocl/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2016-03-04 16:26:07.000000000 +0100
>++++ configure.ac	2016-03-06 11:46:14.420446000 +0100
>+@@ -79,7 +79,7 @@
>+ # LLVM configuration
>+ #
>+ AC_ARG_VAR([LLVM_CONFIG], [Program used to retrieve LLVM options and binaries])
>+-AC_PATH_PROGS([LLVM_CONFIG], [llvm-config llvm-config-mp-3.7 llvm-config-3.7 llvm-config37 llvm-config-mp-3.6 llvm-config-3.6 llvm-config36])
>++AC_PATH_PROGS([LLVM_CONFIG], [llvm-config llvm-config-mp-3.8 llvm-config-3.8 llvm-config-mp-3.7 llvm-config-3.7 llvm-config37 llvm-config-mp-3.6 llvm-config-3.6 llvm-config36])
>+ test -z "$LLVM_CONFIG" && AC_MSG_FAILURE([no llvm-config found in \$PATH])
>+ 
>+ LLVM_VERSION=`$LLVM_CONFIG --version`
>
>Property changes on: pocl/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/files/patch-pocl.icd.in
>===================================================================
>--- pocl/files/patch-pocl.icd.in	(nonexistent)
>+++ pocl/files/patch-pocl.icd.in	(working copy)
>@@ -0,0 +1,5 @@
>+--- ./pocl.icd.in.orig	2014-06-20 18:21:22.000000000 +0200
>++++ ./pocl.icd.in	2014-06-20 18:21:36.000000000 +0200
>+@@ -1 +1 @@
>+-@libdir@/libpocl.so.VER
>++@libdir@/libpocl.so
>
>Property changes on: pocl/files/patch-pocl.icd.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/pkg-descr
>===================================================================
>--- pocl/pkg-descr	(nonexistent)
>+++ pocl/pkg-descr	(working copy)
>@@ -0,0 +1,26 @@
>+Portable OpenCL (pocl)
>+----------------------
>+
>+Portable OpenCL aims to be an efficient open source (MIT-licensed) 
>+implementation of the OpenCL 1.2 standard. 
>+
>+In addition to producing an easily portable open source OpenCL
>+implementation, another major goal of the project is improving 
>+performance portability of OpenCL programs with compiler 
>+optimizations, reducing the need for target-dependent manual 
>+optimizations. At the core of pocl is a set of LLVM passes 
>+used to statically parallelize multiple work-items with the kernel
>+compiler, even in the presence of work-group barriers. This enables 
>+parallelization of the fine-grained static concurrency in the work 
>+groups in multiple ways (SIMD, VLIW, superscalar,...).
>+
>+The code base is modularized to allow easy adding of new "device drivers"
>+in the host-device layer. A generic multithreaded "target driver" is 
>+included. It allows running OpenCL applications on a host that supports 
>+the pthread library with multithreading at the work group granularity.
>+
>+Links
>+-----
>+Home page/wiki:    WWW: http://pocl.sourceforge.net/
>+IRC:               #pocl @ irc.oftc.net
>+
>
>Property changes on: pocl/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/pkg-message
>===================================================================
>--- pocl/pkg-message	(nonexistent)
>+++ pocl/pkg-message	(working copy)
>@@ -0,0 +1,24 @@
>+
>+When using ICD, make sure you have set the environment variable
>+
>+OCL_ICD_VENDORS=${PREFIX}/etc/OpenCL/vendors/
>+
>+properly. Usually, this should point to 
>+${PREFIX}/etc/OpenCL/vendors/
>+with ${PREFIX} set to /usr/local in the standard environment.
>+
>+Deadlocks (freezes) on FreeBSD:
>+
>+OpenCL applications using pocl on FreeBSD must be compiled with 
>+options CFLAGS+=-pthread or CXXFLAGS+=-pthread, otherwise someone risk
>+that a library may not initialize the threading on BSD independently, 
>+even if an ICD loader is used.
>+
>+See: 
>+	http://www.freebsd.org/cgi/query-pr.cgi?pr=163512
>+
>+(Source: http://portablecl.org/docs/html/faq.html?highlight=freebsd)
>+
>+For documentation, please consult
>+
>+	http://portablecl.org/docs/html/
>
>Property changes on: pocl/pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pocl/pkg-plist
>===================================================================
>--- pocl/pkg-plist	(nonexistent)
>+++ pocl/pkg-plist	(working copy)
>@@ -0,0 +1,27 @@
>+bin/pocl-standalone
>+etc/OpenCL/vendors/pocl.icd
>+include/poclu.h
>+lib/libpocl.a
>+lib/libpocl.la
>+lib/libpocl.so
>+lib/libpocl.so.1
>+lib/libpocl.so.1.6.0
>+lib/libpoclu.a
>+lib/libpoclu.la
>+lib/libpoclu.so
>+lib/libpoclu.so.1
>+lib/libpoclu.so.1.6.0
>+lib/pocl/llvmopencl.a
>+lib/pocl/llvmopencl.la
>+lib/pocl/llvmopencl.so
>+lib/pocl/llvmopencl.so.7
>+lib/pocl/llvmopencl.so.7.0.0
>+libdata/pkgconfig/pocl.pc
>+%%DATADIR%%/include/_kernel.h
>+%%DATADIR%%/include/_kernel_c.h
>+%%DATADIR%%/include/_kernel_constants.h
>+%%DATADIR%%/include/pocl.h
>+%%DATADIR%%/include/pocl_device.h
>+%%DATADIR%%/include/pocl_tests.h
>+%%DATADIR%%/include/pocl_types.h
>+%%DATADIR%%/kernel-amd64-portbld-freebsd%%OSREL%%.bc
>
>Property changes on: pocl/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 171914: 128027 | 151645 | 151648 | 156233 | 169196 | 174353 | 175988