Attachment 189095 Details for Bug 224584 – POCL 1.0-patch and pkg-plist fix

POCL 1.0-patch and pkg-plist fix

patch_pocl_1.0.txt (text/plain), 4.22 KB, created by O. Hartmann on 2017-12-25 15:07:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: O. Hartmann

Created: 2017-12-25 15:07:00 UTC

Size: 4.22 KB

patch

obsolete

>Index: lang/pocl/Makefile
>===================================================================
>--- lang/pocl/Makefile	(revision 457224)
>+++ lang/pocl/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pocl
>-PORTVERSION=	0.14
>+PORTVERSION=	1.0
> CATEGORIES=	lang
> MASTER_SITES=	SF/pocl \
> 		http://portablecl.org/downloads/
>@@ -12,8 +12,6 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN=		fails to package
>-
> BUILD_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \
> 		opencl>=2.1:devel/opencl
> LIB_DEPENDS=	libhwloc.so:devel/hwloc \
>@@ -22,14 +20,14 @@
> RUN_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION}
> 
> BROKEN_FreeBSD_10=	pocl is not supported on 10.x
>-ONLY_FOR_ARCHS=		i386 amd64
>+ONLY_FOR_ARCHS=		amd64 i386
> ONLY_FOR_ARCHS_REASON=	only tested on x86
> 
> LLVM_VERSION=	${MESA_LLVM_VER:U40}
> 
>+USES=		cmake localbase:ldflags ncurses pkgconfig
> USE_LDCONFIG=	yes
> USE_CXXSTD=	gnu++11
>-USES=		cmake localbase:ldflags ncurses pkgconfig
> 
> CMAKE_ARGS=	-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
> 		-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
>Index: lang/pocl/distinfo
>===================================================================
>--- lang/pocl/distinfo	(revision 457224)
>+++ lang/pocl/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491868935
>-SHA256 (pocl-0.14.tar.gz) = 2127bf925a91fbbe3daf2f1bac0da5c8aceb16e2a9434977a3057eade974106a
>-SIZE (pocl-0.14.tar.gz) = 1231630
>+TIMESTAMP = 1513954395
>+SHA256 (pocl-1.0.tar.gz) = 94bd86a2f9847c03e6c3bf8dca12af3734f8b272ffeacbc3fa8fcca58844b1d4
>+SIZE (pocl-1.0.tar.gz) = 1536827
>Index: lang/pocl/files/patch-tests_regression_test__issue__445.cpp
>===================================================================
>--- lang/pocl/files/patch-tests_regression_test__issue__445.cpp	(revision 457224)
>+++ lang/pocl/files/patch-tests_regression_test__issue__445.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- tests/regression/test_issue_445.cpp.orig	2017-04-05 14:15:40 UTC
>-+++ tests/regression/test_issue_445.cpp
>-@@ -29,7 +29,7 @@ private_local_array(__global int *__rest
>- }
>- )CLC";
>- 
>--int main(int, char *)
>-+int main(int, char **)
>- {
>-   try {
>-     int N = 9;
>
>Property changes on: lang/pocl/files/patch-tests_regression_test__issue__445.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: lang/pocl/pkg-plist
>===================================================================
>--- lang/pocl/pkg-plist	(revision 457224)
>+++ lang/pocl/pkg-plist	(working copy)
>@@ -2,13 +2,14 @@
> etc/OpenCL/vendors/pocl.icd
> include/poclu.h
> lib/libpocl.so
>-lib/libpocl.so.1
>-lib/libpocl.so.1.7.0
>+lib/libpocl.so.2
>+lib/libpocl.so.2.0.0
> lib/libpoclu.so
>-lib/libpoclu.so.1
>-lib/libpoclu.so.1.7.0
>+lib/libpoclu.so.2
>+lib/libpoclu.so.2.0.0
> lib/pocl/libllvmopencl.so
> libdata/pkgconfig/pocl.pc
>+%%DATADIR%%/include/_builtin_renames.h
> %%DATADIR%%/include/_enable_all_exts.h
> %%DATADIR%%/include/_kernel.h
> %%DATADIR%%/include/_kernel_c.h
>@@ -16,10 +17,11 @@
> %%DATADIR%%/include/pocl.h
> %%DATADIR%%/include/pocl_device.h
> %%DATADIR%%/include/pocl_types.h
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx2.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx512.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx_fma4.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-sse2.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-sse41.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-ssse3.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx2.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx512.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx_f16c.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx_fma4.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-sse2.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-sse41.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-ssse3.bc

Actions: View

Attachments on bug 224584: 189095 | 189556 | 190869 | 192103 | 196942 | 197659 | 197660 | 197701 | 204140 | 204838