Attachment 175988 Details for Bug 171914 – Current pocl 0.13 without the sysinfo patch

[patch] Current pocl 0.13 without the sysinfo patch

pocl-0.13.diff (text/plain), 10.19 KB, created by Koop Mast on 2016-10-20 19:08:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2016-10-20 19:08:48 UTC

Size: 10.19 KB

patch

obsolete

>Index: devel/pocl/Makefile
>===================================================================
>--- devel/pocl/Makefile	(nonexistent)
>+++ devel/pocl/Makefile	(working copy)
>@@ -0,0 +1,76 @@
>+# $FreeBSD$
>+
>+PORTNAME=	pocl
>+PORTVERSION=	0.13
>+CATEGORIES=	devel
>+MASTER_SITES=	SF/pocl \
>+		http://portablecl.org/downloads/
>+
>+MAINTAINER=	ohartman@zedat.fu-berlin.de
>+COMMENT=	POrtable Computing Language (POCL)
>+
>+LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+BUILD_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION}
>+LIB_DEPENDS=	libhwloc.so:devel/hwloc \
>+		libltdl.so:devel/libltdl
>+RUN_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION}
>+
>+CONFLICTS=		freeocl[0-9]*
>+
>+NOT_FOR_ARCHS= 	i386
>+
>+LLVM_VERSION=	37
>+
>+GNU_CONFIGURE=	yes
>+USE_LDCONFIG=	yes
>+USE_GL=		yes
>+#USES=		autoreconf gmake localbase pathfix pkgconfig libtool
>+USES=		gmake localbase ncurses pathfix pkgconfig libtool:keepla
>+
>+INSTALL_TARGET= install-strip
>+
>+MAKE_ARGS+=	PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
>+
>+CONFIGURE_ENV=	LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
>+		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_BUILD_DEPENDS_OFF=	opencl>=2.1:devel/opencl
>+
>+OCL_ICD_LIB_DEPENDS=	libOpenCL.so: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
>+
>+do-test:
>+	cd ${WRKSRC} && ${GMAKE} check
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/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: devel/pocl/distinfo
>===================================================================
>--- devel/pocl/distinfo	(nonexistent)
>+++ devel/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: devel/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: devel/pocl/files/patch-Makefile.in
>===================================================================
>--- devel/pocl/files/patch-Makefile.in	(nonexistent)
>+++ devel/pocl/files/patch-Makefile.in	(working copy)
>@@ -0,0 +1,25 @@
>+First part: this is false, this was due to a libtool bug, which is fixed now
>+Second part: cmp --quiet is long for the -s option, use that since FreeBSD
>+cmp doesn't have the long option.
>+
>+--- Makefile.in.orig	2016-09-13 22:57:13.327123000 +0200
>++++ Makefile.in	2016-09-13 23:01:18.738696000 +0200
>+@@ -116,8 +116,7 @@
>+ @POCL_ANDROID_FALSE@am__append_1 = scripts examples tests
>+ 
>+ #TODO: this naming scheme is used on other platforms (primarly BSDs?) too
>+-@BUILD_ICD_TRUE@@FREEBSD_HOST_OS_TRUE@am__append_2 = -e 's,so.VER,so.$(LIB_CURRENT_VERSION),g'
>+-@BUILD_ICD_TRUE@@FREEBSD_HOST_OS_FALSE@am__append_3 = -e 's,so.VER,so.$(LIB_FIRST_VERSION).$(LIB_AGE_VERSION).$(LIB_REVISION_VERSION),g'
>++@BUILD_ICD_TRUE@am__append_3 = -e 's,so.VER,so.$(LIB_FIRST_VERSION).$(LIB_AGE_VERSION).$(LIB_REVISION_VERSION),g'
>+ @BUILD_ICD_TRUE@am__append_4 = pocl.icd
>+ @BUILD_ICD_TRUE@am__append_5 = pocl.icd
>+ subdir = .
>+@@ -1076,7 +1075,7 @@
>+ 	echo "#define PKGDATADIR \"${pkgdatadir}\"" > $@.new
>+ 	echo "#define PKGLIBEXECDIR \"${pkglibexecdir}\"" >> $@.new
>+ 	echo "#define PKGINCLUDEDIR \"${pkgincludedir}\"" >> $@.new
>+-	@if cmp --quiet $@.new $@ ; then \
>++	@if cmp -s $@.new $@ ; then \
>+ 		: "Paths not changed" ;\
>+ 		$(RM) $@.new ;\
>+ 	else \
>
>Property changes on: devel/pocl/files/patch-Makefile.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: devel/pocl/files/patch-scripts_Makefile.in
>===================================================================
>--- devel/pocl/files/patch-scripts_Makefile.in	(nonexistent)
>+++ devel/pocl/files/patch-scripts_Makefile.in	(working copy)
>@@ -0,0 +1,21 @@
>+dirty hack, pocl-standalone will be installed into stage with
>+r-xr-xr-x permissions. So writing to it is problemetic. give the file write
>+permission and take it away after.
>+
>+Upstream (pre 0.14) will be a lot different
>+
>+--- scripts/Makefile.in.orig	2016-09-13 22:10:48.091956000 +0200
>++++ scripts/Makefile.in	2016-09-13 22:13:33.388168000 +0200
>+@@ -651,10 +651,11 @@
>+ 
>+ install-exec-hook: $(bin_SCRIPTS) 
>+ 	for f in $(bin_SCRIPTS) ; do \
>++		chmod +w "$(DESTDIR)$(bindir)/$$f" ; \
>+ 		sed -e '/^# BEGIN REMOVE ONCE INSTALLED$$/,/^# END REMOVE ONCE INSTALLED$$/d' \
>+ 			> "$(DESTDIR)$(bindir)/$$f" \
>+ 			< "$$f" && \
>+-		chmod +x "$(DESTDIR)$(bindir)/$$f" ; \
>++		chmod +x-w "$(DESTDIR)$(bindir)/$$f" ; \
>+ 	done
>+ 
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>
>Property changes on: devel/pocl/files/patch-scripts_Makefile.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: devel/pocl/pkg-descr
>===================================================================
>--- devel/pocl/pkg-descr	(nonexistent)
>+++ devel/pocl/pkg-descr	(working copy)
>@@ -0,0 +1,22 @@
>+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.
>+
>+WWW: http://portablecl.org/
>
>Property changes on: devel/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: devel/pocl/pkg-message
>===================================================================
>--- devel/pocl/pkg-message	(nonexistent)
>+++ devel/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: devel/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: devel/pocl/pkg-plist
>===================================================================
>--- devel/pocl/pkg-plist	(nonexistent)
>+++ devel/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: devel/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