Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Jan 2015 16:00:19 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377023 - in head/devel/libclc: . files
Message-ID:  <201501141600.t0EG0JMx061716@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Wed Jan 14 16:00:18 2015
New Revision: 377023
URL: https://svnweb.freebsd.org/changeset/ports/377023
QAT: https://qat.redports.org/buildarchive/r377023/

Log:
  Update libclc to revision 222830.
  
  Use 0.0.1 as portversion because upstream uses it.
  Switch to llvm/clang 3.5.
  Mark ignore on 8.x due lack of llvm 3.5 and 9.x due to missing C++ header.
  Switch the J and f option around in the tar command in the do-fetch block,
    so we don't create a 'J' tar file.

Deleted:
  head/devel/libclc/files/patch-generic_include_clc_clctypes.h
Modified:
  head/devel/libclc/Makefile
  head/devel/libclc/Makefile.svn_rev
  head/devel/libclc/distinfo
  head/devel/libclc/pkg-descr
  head/devel/libclc/pkg-plist

Modified: head/devel/libclc/Makefile
==============================================================================
--- head/devel/libclc/Makefile	Wed Jan 14 15:49:55 2015	(r377022)
+++ head/devel/libclc/Makefile	Wed Jan 14 16:00:18 2015	(r377023)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libclc
-DISTVERSION=	0.0.r${SVN_REV}
+DISTVERSION=	0.0.1.r${SVN_REV}
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/kwm
 
@@ -12,20 +12,26 @@ COMMENT=	Required library functions for 
 BUILD_DEPENDS=	clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER}
 
 GNU_CONFIGURE=	yes
-USES=		gmake python:build ninja tar:xz
+USES=		gmake python:2,build ninja tar:xz
 USE_LDCONFIG=	yes
 MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
 
-LLVMVER=	34
+LLVMVER=	35
 
 ALL_TARGET=	
 
-#.include <bsd.port.pre.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 900000
+IGNORE=	LLVM 3.5 is not available on 8.x
+.elif ${OSVERSION} < 1000000
+IGNORE=	Does not build, missing <system_error> header
+.endif
 
 .if !defined(SVN_REV)
 .if defined(BOOTSTRAP)
 LANG=		"C"
-SVN_REV!=	svn info http://llvm.org/svn/llvm-project/ | ${GREP} Revision | cut -d' ' -f2
+SVN_REV!=	svn info http://llvm.org/svn/llvm-project/ | ${GREP} "Revision" | cut -d' ' -f2
 .else
 .include "Makefile.svn_rev"
 .endif
@@ -38,7 +44,7 @@ do-fetch:
 	${MKDIR} ${WRKDIR}
 	svn export -r ${SVN_REV} \
 	    http://llvm.org/svn/llvm-project/libclc/trunk ${WRKSRC}
-	cd ${WRKDIR}; tar cvfJ ${DISTDIR}/${DISTNAME}.tar.xz ${DISTNAME}
+	cd ${WRKDIR}; tar cvJf ${DISTDIR}/${DISTNAME}.tar.xz ${DISTNAME}
 	echo "SVN_REV=	${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
 .if ${USER} == kwm
 	scp ${DISTDIR}/${DISTNAME}.tar.xz \
@@ -47,14 +53,13 @@ do-fetch:
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|python|${PYTHON_VERSION}|g' \
-		-e 's|/usr/bin/python|${PYTHON_CMD}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
 		${WRKSRC}/build/ninja_syntax.py \
 		${WRKSRC}/configure.py
 
 do-configure:
-	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py -g ninja \
+	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g ninja \
 		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \
 		--pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/libclc/Makefile.svn_rev
==============================================================================
--- head/devel/libclc/Makefile.svn_rev	Wed Jan 14 15:49:55 2015	(r377022)
+++ head/devel/libclc/Makefile.svn_rev	Wed Jan 14 16:00:18 2015	(r377023)
@@ -1 +1 @@
-SVN_REV=	216063
+SVN_REV=	222830

Modified: head/devel/libclc/distinfo
==============================================================================
--- head/devel/libclc/distinfo	Wed Jan 14 15:49:55 2015	(r377022)
+++ head/devel/libclc/distinfo	Wed Jan 14 16:00:18 2015	(r377023)
@@ -1,2 +1,2 @@
-SHA256 (libclc-0.0.r216063.tar.xz) = 3fce107018c559599cb73af6654cbae356437aae502b8e0f1c2e3f77c6ca867e
-SIZE (libclc-0.0.r216063.tar.xz) = 36776
+SHA256 (libclc-0.0.1.r222830.tar.xz) = a3e361bde0158cb853fdaba14b6a13c87dfce7a4fe7cd410b672df47a2d63423
+SIZE (libclc-0.0.1.r222830.tar.xz) = 44932

Modified: head/devel/libclc/pkg-descr
==============================================================================
--- head/devel/libclc/pkg-descr	Wed Jan 14 15:49:55 2015	(r377022)
+++ head/devel/libclc/pkg-descr	Wed Jan 14 16:00:18 2015	(r377023)
@@ -3,5 +3,7 @@ requirements of the OpenCL C programming
 OpenCL 1.1 Specification. The following sections of the specification
 impose library requirements:
 
+Libclc is intended to be used with the Clang compiler's OpenCL frontend
+
 WWW: http://libclc.llvm.org/
 

Modified: head/devel/libclc/pkg-plist
==============================================================================
--- head/devel/libclc/pkg-plist	Wed Jan 14 15:49:55 2015	(r377022)
+++ head/devel/libclc/pkg-plist	Wed Jan 14 16:00:18 2015	(r377023)
@@ -1,13 +1,46 @@
 include/clc/as_type.h
+include/clc/async/async_work_group_copy.h
+include/clc/async/async_work_group_copy.inc
+include/clc/async/async_work_group_strided_copy.h
+include/clc/async/async_work_group_strided_copy.inc
+include/clc/async/gentype.inc
+include/clc/async/prefetch.h
+include/clc/async/prefetch.inc
+include/clc/async/wait_group_events.h
 include/clc/atomic/atomic_add.h
+include/clc/atomic/atomic_and.h
+include/clc/atomic/atomic_cmpxchg.h
 include/clc/atomic/atomic_dec.h
 include/clc/atomic/atomic_decl.inc
 include/clc/atomic/atomic_inc.h
+include/clc/atomic/atomic_max.h
+include/clc/atomic/atomic_min.h
+include/clc/atomic/atomic_or.h
 include/clc/atomic/atomic_sub.h
+include/clc/atomic/atomic_xchg.h
+include/clc/atomic/atomic_xor.h
 include/clc/cl_khr_global_int32_base_atomics/atom_add.h
+include/clc/cl_khr_global_int32_base_atomics/atom_cmpxchg.h
 include/clc/cl_khr_global_int32_base_atomics/atom_dec.h
 include/clc/cl_khr_global_int32_base_atomics/atom_inc.h
 include/clc/cl_khr_global_int32_base_atomics/atom_sub.h
+include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h
+include/clc/cl_khr_global_int32_extended_atomics/atom_and.h
+include/clc/cl_khr_global_int32_extended_atomics/atom_max.h
+include/clc/cl_khr_global_int32_extended_atomics/atom_min.h
+include/clc/cl_khr_global_int32_extended_atomics/atom_or.h
+include/clc/cl_khr_global_int32_extended_atomics/atom_xor.h
+include/clc/cl_khr_local_int32_base_atomics/atom_add.h
+include/clc/cl_khr_local_int32_base_atomics/atom_cmpxchg.h
+include/clc/cl_khr_local_int32_base_atomics/atom_dec.h
+include/clc/cl_khr_local_int32_base_atomics/atom_inc.h
+include/clc/cl_khr_local_int32_base_atomics/atom_sub.h
+include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h
+include/clc/cl_khr_local_int32_extended_atomics/atom_and.h
+include/clc/cl_khr_local_int32_extended_atomics/atom_max.h
+include/clc/cl_khr_local_int32_extended_atomics/atom_min.h
+include/clc/cl_khr_local_int32_extended_atomics/atom_or.h
+include/clc/cl_khr_local_int32_extended_atomics/atom_xor.h
 include/clc/clc.h
 include/clc/clcfunc.h
 include/clc/clctypes.h
@@ -40,6 +73,8 @@ include/clc/integer/integer-gentype.inc
 include/clc/integer/mad24.h
 include/clc/integer/mad24.inc
 include/clc/integer/mad_hi.h
+include/clc/integer/mad_sat.h
+include/clc/integer/mad_sat.inc
 include/clc/integer/mul24.h
 include/clc/integer/mul24.inc
 include/clc/integer/mul_hi.h
@@ -51,6 +86,10 @@ include/clc/integer/rotate.inc
 include/clc/integer/sub_sat.h
 include/clc/integer/sub_sat.inc
 include/clc/integer/upsample.h
+include/clc/math/acos.h
+include/clc/math/acos.inc
+include/clc/math/asin.h
+include/clc/math/asin.inc
 include/clc/math/atan.h
 include/clc/math/atan.inc
 include/clc/math/atan2.h
@@ -60,6 +99,7 @@ include/clc/math/binary_intrin.inc
 include/clc/math/ceil.h
 include/clc/math/clc_nextafter.h
 include/clc/math/copysign.h
+include/clc/math/copysign.inc
 include/clc/math/cos.h
 include/clc/math/cos.inc
 include/clc/math/exp.h
@@ -70,10 +110,14 @@ include/clc/math/floor.h
 include/clc/math/fma.h
 include/clc/math/fmax.h
 include/clc/math/fmin.h
+include/clc/math/fmod.h
+include/clc/math/fmod.inc
 include/clc/math/gentype.inc
 include/clc/math/hypot.h
 include/clc/math/hypot.inc
 include/clc/math/log.h
+include/clc/math/log1p.h
+include/clc/math/log1p.inc
 include/clc/math/log2.h
 include/clc/math/mad.h
 include/clc/math/mad.inc
@@ -100,6 +144,8 @@ include/clc/math/sin.inc
 include/clc/math/sincos.h
 include/clc/math/sincos.inc
 include/clc/math/sqrt.h
+include/clc/math/tan.h
+include/clc/math/tan.inc
 include/clc/math/ternary_intrin.inc
 include/clc/math/trunc.h
 include/clc/math/unary_decl.inc
@@ -110,12 +156,18 @@ include/clc/relational/binary_decl.inc
 include/clc/relational/bitselect.h
 include/clc/relational/floatn.inc
 include/clc/relational/isequal.h
+include/clc/relational/isfinite.h
 include/clc/relational/isgreater.h
 include/clc/relational/isgreaterequal.h
+include/clc/relational/isinf.h
 include/clc/relational/isless.h
 include/clc/relational/islessequal.h
+include/clc/relational/islessgreater.h
 include/clc/relational/isnan.h
+include/clc/relational/isnormal.h
 include/clc/relational/isnotequal.h
+include/clc/relational/isordered.h
+include/clc/relational/isunordered.h
 include/clc/relational/select.h
 include/clc/relational/signbit.h
 include/clc/relational/unary_decl.inc
@@ -135,6 +187,7 @@ include/clc/workitem/get_group_id.h
 include/clc/workitem/get_local_id.h
 include/clc/workitem/get_local_size.h
 include/clc/workitem/get_num_groups.h
+include/clc/workitem/get_work_dim.h
 lib/clc/aruba-r600--.bc
 lib/clc/barts-r600--.bc
 lib/clc/bonaire-r600--.bc
@@ -142,11 +195,13 @@ lib/clc/caicos-r600--.bc
 lib/clc/cayman-r600--.bc
 lib/clc/cedar-r600--.bc
 lib/clc/cypress-r600--.bc
+lib/clc/hainan-r600--.bc
 lib/clc/hawaii-r600--.bc
 lib/clc/hemlock-r600--.bc
 lib/clc/juniper-r600--.bc
 lib/clc/kabini-r600--.bc
 lib/clc/kaveri-r600--.bc
+lib/clc/mullins-r600--.bc
 lib/clc/nvptx--nvidiacl.bc
 lib/clc/nvptx64--nvidiacl.bc
 lib/clc/oland-r600--.bc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501141600.t0EG0JMx061716>