Index: head/devel/libclc/Makefile =================================================================== --- head/devel/libclc/Makefile (revision 457262) +++ head/devel/libclc/Makefile (revision 457263) @@ -1,43 +1,43 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= libclc -DISTVERSION= 0.3.0.20170927 +DISTVERSION= 0.3.0.20171127 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org COMMENT= Required library functions for OpenCL C programming language LICENSE= BSD3CLAUSE MIT LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE.TXT BUILD_DEPENDS= llvm${LLVMVER}>=4.0:devel/llvm${LLVMVER} \ libedit>=0:devel/libedit USE_GITHUB= yes GH_ACCOUNT= llvm-mirror -GH_TAGNAME= 81f74b2 +GH_TAGNAME= d638441 # ninja based build is broken since commit 598792bc (16 sep 2016) USES= gmake python:2.7,build gmake USE_LDCONFIG= yes MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR} -LLVMVER= ${MESA_LLVM_VER:U40} +LLVMVER= ${MESA_LLVM_VER:U50} ALL_TARGET= post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \ -e 's|"python |"${PYTHON_VERSION} |g' \ ${WRKSRC}/build/ninja_syntax.py \ ${WRKSRC}/configure.py do-configure: @cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g make \ --with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \ --pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --prefix=${PREFIX} .include Index: head/devel/libclc/distinfo =================================================================== --- head/devel/libclc/distinfo (revision 457262) +++ head/devel/libclc/distinfo (revision 457263) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506535396 -SHA256 (llvm-mirror-libclc-0.3.0.20170927-81f74b2_GH0.tar.gz) = d1436fda242d19d3d19f05a4068fa6310cbfe0f523c2fcd567b83be1f00db89a -SIZE (llvm-mirror-libclc-0.3.0.20170927-81f74b2_GH0.tar.gz) = 137560 +TIMESTAMP = 1514209095 +SHA256 (llvm-mirror-libclc-0.3.0.20171127-d638441_GH0.tar.gz) = 1873176836da9d45e85b1a7a180f4b9f6d4a61e98be4c5c7d32eabca9c88c88b +SIZE (llvm-mirror-libclc-0.3.0.20171127-d638441_GH0.tar.gz) = 138007 Index: head/devel/libclc/files/patch-configure.py =================================================================== --- head/devel/libclc/files/patch-configure.py (revision 457262) +++ head/devel/libclc/files/patch-configure.py (revision 457263) @@ -1,27 +1,38 @@ +Fix use of execinfo from llvm-config --system-libs + The LLVM_TOOL_LINK builds a helper tool named utils/prepare-builtins that requires libedit which in turn pulls in libtinfo (part of libncurses). In order to support builds on platforms without base ncurses (e.g. DF), require base libedit. This requires an additional -L LDFLAGS to search ${LOCALBASE}/lib for the needed libs. (prepare-builtins is not installed) ---- configure.py.orig 2015-07-10 13:37:04 UTC +--- configure.py.orig 2017-11-27 11:14:06 UTC +++ configure.py -@@ -118,7 +118,8 @@ b.rule("OPT", command = llvm_opt + " -O3 +@@ -76,7 +76,7 @@ if llvm_int_version < 390: + print("libclc requires LLVM >= 3.9") + sys.exit(1) + +-llvm_system_libs = llvm_config(['--system-libs']) ++llvm_system_libs = (llvm_config(['--system-libs'])).replace("-l/usr/lib/libexecinfo.so","-lexecinfo") + llvm_bindir = llvm_config(['--bindir']) + llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' + \ + llvm_system_libs + ' ' + \ +@@ -131,7 +131,8 @@ b = metabuild.from_name(options.g) description = 'OPT $out') c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags) -b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out') +b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + + " -L" + prefix + "/lib -Wl,-rpath %s" % llvm_libdir, 'LINK $out') prepare_builtins = os.path.join('utils', 'prepare-builtins') b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX", -@@ -264,7 +265,7 @@ install_cmd = ' && '.join(['mkdir -p ${D +@@ -290,7 +291,7 @@ install_cmd = ' && '.join(['mkdir -p ${D {'src': file, 'dst': libexecdir} for (file, dest) in install_files_bc]) -install_cmd = ' && '.join(['%(old)s && mkdir -p ${DESTDIR}/%(dst)s && cp -r %(srcdir)s/generic/include/clc ${DESTDIR}/%(dst)s' % +install_cmd = ' && '.join(['%(old)s && mkdir -p ${DESTDIR}/%(dst)s && cp -r generic/include/clc ${DESTDIR}/%(dst)s' % {'old': install_cmd, 'dst': includedir, 'srcdir': srcdir}]) Index: head/devel/libclc/pkg-plist =================================================================== --- head/devel/libclc/pkg-plist (revision 457262) +++ head/devel/libclc/pkg-plist (revision 457263) @@ -1,351 +1,330 @@ 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_int64_base_atomics/atom_add.h include/clc/cl_khr_int64_base_atomics/atom_cmpxchg.h include/clc/cl_khr_int64_base_atomics/atom_dec.h include/clc/cl_khr_int64_base_atomics/atom_inc.h include/clc/cl_khr_int64_base_atomics/atom_sub.h include/clc/cl_khr_int64_base_atomics/atom_xchg.h include/clc/cl_khr_int64_extended_atomics/atom_and.h include/clc/cl_khr_int64_extended_atomics/atom_max.h include/clc/cl_khr_int64_extended_atomics/atom_min.h include/clc/cl_khr_int64_extended_atomics/atom_or.h include/clc/cl_khr_int64_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/clcmacros.h include/clc/clctypes.h include/clc/common/degrees.h include/clc/common/degrees.inc include/clc/common/mix.h include/clc/common/mix.inc include/clc/common/radians.h include/clc/common/radians.inc include/clc/common/sign.h include/clc/common/smoothstep.h include/clc/common/smoothstep.inc include/clc/common/step.h include/clc/common/step.inc include/clc/convert.h include/clc/explicit_fence/explicit_memory_fence.h include/clc/float/definitions.h include/clc/geometric/cross.h include/clc/geometric/distance.h include/clc/geometric/distance.inc include/clc/geometric/dot.h include/clc/geometric/dot.inc include/clc/geometric/fast_distance.h include/clc/geometric/fast_distance.inc include/clc/geometric/fast_length.h include/clc/geometric/fast_length.inc include/clc/geometric/fast_normalize.h include/clc/geometric/fast_normalize.inc include/clc/geometric/floatn.inc include/clc/geometric/length.h include/clc/geometric/length.inc include/clc/geometric/normalize.h include/clc/geometric/normalize.inc include/clc/image/image.h include/clc/image/image_defines.h include/clc/integer/abs.h include/clc/integer/abs.inc include/clc/integer/abs_diff.h include/clc/integer/abs_diff.inc include/clc/integer/add_sat.h include/clc/integer/add_sat.inc include/clc/integer/clz.h include/clc/integer/clz.inc include/clc/integer/definitions.h include/clc/integer/gentype.inc include/clc/integer/hadd.h include/clc/integer/hadd.inc 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 include/clc/integer/mul_hi.inc include/clc/integer/popcount.h include/clc/integer/rhadd.h include/clc/integer/rhadd.inc include/clc/integer/rotate.h include/clc/integer/rotate.inc include/clc/integer/sub_sat.h include/clc/integer/sub_sat.inc include/clc/integer/unary_intrin.inc include/clc/integer/upsample.h include/clc/math/acos.h -include/clc/math/acos.inc include/clc/math/acosh.h -include/clc/math/acosh.inc include/clc/math/acospi.h -include/clc/math/acospi.inc include/clc/math/asin.h -include/clc/math/asin.inc include/clc/math/asinh.h -include/clc/math/asinh.inc include/clc/math/asinpi.h -include/clc/math/asinpi.inc include/clc/math/atan.h -include/clc/math/atan.inc include/clc/math/atan2.h include/clc/math/atan2.inc include/clc/math/atan2pi.h include/clc/math/atan2pi.inc include/clc/math/atanh.h -include/clc/math/atanh.inc include/clc/math/atanpi.h -include/clc/math/atanpi.inc include/clc/math/binary_decl.inc +include/clc/math/binary_decl_tt.inc include/clc/math/binary_intrin.inc include/clc/math/cbrt.h -include/clc/math/cbrt.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/cosh.h -include/clc/math/cosh.inc include/clc/math/cospi.h -include/clc/math/cospi.inc include/clc/math/erf.h include/clc/math/erfc.h include/clc/math/exp.h include/clc/math/exp10.h include/clc/math/exp2.h -include/clc/math/exp2.inc include/clc/math/expm1.h include/clc/math/fabs.h include/clc/math/fdim.h include/clc/math/fdim.inc 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/fract.h include/clc/math/fract.inc include/clc/math/frexp.h include/clc/math/frexp.inc include/clc/math/gentype.inc include/clc/math/half_rsqrt.h include/clc/math/half_sqrt.h include/clc/math/hypot.h include/clc/math/hypot.inc include/clc/math/ilogb.h include/clc/math/ilogb.inc include/clc/math/ldexp.h include/clc/math/ldexp.inc include/clc/math/lgamma.h -include/clc/math/lgamma.inc include/clc/math/lgamma_r.h include/clc/math/lgamma_r.inc include/clc/math/log.h -include/clc/math/log.inc include/clc/math/log10.h include/clc/math/log1p.h -include/clc/math/log1p.inc include/clc/math/log2.h -include/clc/math/log2.inc include/clc/math/logb.h -include/clc/math/logb.inc include/clc/math/mad.h include/clc/math/mad.inc +include/clc/math/maxmag.h +include/clc/math/minmag.h include/clc/math/modf.h include/clc/math/modf.inc include/clc/math/native_cos.h include/clc/math/native_divide.h include/clc/math/native_exp.h include/clc/math/native_exp10.h include/clc/math/native_exp2.h include/clc/math/native_log.h -include/clc/math/native_log.inc +include/clc/math/native_log10.h include/clc/math/native_log2.h -include/clc/math/native_log2.inc include/clc/math/native_powr.h include/clc/math/native_recip.h include/clc/math/native_rsqrt.h include/clc/math/native_sin.h include/clc/math/native_sqrt.h include/clc/math/native_tan.h include/clc/math/nextafter.h +include/clc/math/nextafter.inc include/clc/math/pow.h include/clc/math/pown.h include/clc/math/rint.h include/clc/math/round.h include/clc/math/rsqrt.h include/clc/math/sin.h -include/clc/math/sin.inc include/clc/math/sincos.h include/clc/math/sincos.inc include/clc/math/sinh.h -include/clc/math/sinh.inc include/clc/math/sinpi.h -include/clc/math/sinpi.inc include/clc/math/sqrt.h -include/clc/math/sqrt.inc include/clc/math/tan.h -include/clc/math/tan.inc include/clc/math/tanh.h -include/clc/math/tanh.inc include/clc/math/ternary_intrin.inc include/clc/math/tgamma.h -include/clc/math/tgamma.inc include/clc/math/trunc.h include/clc/math/unary_decl.inc include/clc/math/unary_intrin.inc include/clc/misc/shuffle.h include/clc/misc/shuffle2.h include/clc/relational/all.h include/clc/relational/any.h include/clc/relational/binary_decl.inc include/clc/relational/bitselect.h include/clc/relational/bitselect.inc 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 include/clc/shared/clamp.h include/clc/shared/clamp.inc include/clc/shared/max.h include/clc/shared/max.inc include/clc/shared/min.h include/clc/shared/min.inc include/clc/shared/vload.h include/clc/shared/vstore.h include/clc/synchronization/barrier.h include/clc/synchronization/cl_mem_fence_flags.h include/clc/workitem/get_global_id.h include/clc/workitem/get_global_offset.h include/clc/workitem/get_global_size.h 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/amdgcn--amdhsa.bc lib/clc/aruba-r600--.bc lib/clc/barts-r600--.bc lib/clc/bonaire-amdgcn--.bc lib/clc/bonaire-amdgcn--amdhsa.bc lib/clc/bonaire-amdgcn-mesa-mesa3d.bc lib/clc/caicos-r600--.bc lib/clc/carrizo-amdgcn--.bc lib/clc/carrizo-amdgcn--amdhsa.bc lib/clc/carrizo-amdgcn-mesa-mesa3d.bc lib/clc/cayman-r600--.bc lib/clc/cedar-r600--.bc lib/clc/cypress-r600--.bc lib/clc/fiji-amdgcn--.bc lib/clc/fiji-amdgcn--amdhsa.bc lib/clc/fiji-amdgcn-mesa-mesa3d.bc +lib/clc/gfx900-amdgcn--.bc +lib/clc/gfx900-amdgcn--amdhsa.bc +lib/clc/gfx900-amdgcn-mesa-mesa3d.bc lib/clc/hainan-amdgcn--.bc lib/clc/hainan-amdgcn-mesa-mesa3d.bc lib/clc/hawaii-amdgcn--.bc lib/clc/hawaii-amdgcn--amdhsa.bc lib/clc/hawaii-amdgcn-mesa-mesa3d.bc lib/clc/hemlock-r600--.bc lib/clc/iceland-amdgcn--.bc lib/clc/iceland-amdgcn--amdhsa.bc lib/clc/iceland-amdgcn-mesa-mesa3d.bc lib/clc/juniper-r600--.bc lib/clc/kabini-amdgcn--.bc lib/clc/kabini-amdgcn--amdhsa.bc lib/clc/kabini-amdgcn-mesa-mesa3d.bc lib/clc/kaveri-amdgcn--.bc lib/clc/kaveri-amdgcn--amdhsa.bc lib/clc/kaveri-amdgcn-mesa-mesa3d.bc lib/clc/mullins-amdgcn--.bc lib/clc/mullins-amdgcn--amdhsa.bc lib/clc/mullins-amdgcn-mesa-mesa3d.bc lib/clc/nvptx--nvidiacl.bc lib/clc/nvptx64--nvidiacl.bc lib/clc/oland-amdgcn--.bc lib/clc/oland-amdgcn-mesa-mesa3d.bc lib/clc/palm-r600--.bc lib/clc/pitcairn-amdgcn--.bc lib/clc/pitcairn-amdgcn-mesa-mesa3d.bc lib/clc/polaris10-amdgcn--.bc lib/clc/polaris10-amdgcn--amdhsa.bc lib/clc/polaris10-amdgcn-mesa-mesa3d.bc lib/clc/polaris11-amdgcn--.bc lib/clc/polaris11-amdgcn--amdhsa.bc lib/clc/polaris11-amdgcn-mesa-mesa3d.bc lib/clc/redwood-r600--.bc lib/clc/stoney-amdgcn--.bc lib/clc/stoney-amdgcn--amdhsa.bc lib/clc/stoney-amdgcn-mesa-mesa3d.bc lib/clc/subnormal_disable.bc lib/clc/subnormal_use_default.bc lib/clc/sumo-r600--.bc lib/clc/sumo2-r600--.bc lib/clc/tahiti-amdgcn--.bc lib/clc/tahiti-amdgcn-mesa-mesa3d.bc lib/clc/tonga-amdgcn--.bc lib/clc/tonga-amdgcn--amdhsa.bc lib/clc/tonga-amdgcn-mesa-mesa3d.bc lib/clc/turks-r600--.bc lib/clc/verde-amdgcn--.bc lib/clc/verde-amdgcn-mesa-mesa3d.bc libdata/pkgconfig/libclc.pc