diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile index 28550447298e..10ad70899bf7 100644 --- a/devel/libclc/Makefile +++ b/devel/libclc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libclc -DISTVERSION= 0.3.0.20170927 +DISTVERSION= 0.3.0.20171127 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org @@ -17,14 +17,14 @@ BUILD_DEPENDS= llvm${LLVMVER}>=4.0:devel/llvm${LLVMVER} \ 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= diff --git a/devel/libclc/distinfo b/devel/libclc/distinfo index 454649f6da50..28357cd0683c 100644 --- a/devel/libclc/distinfo +++ b/devel/libclc/distinfo @@ -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 diff --git a/devel/libclc/files/patch-configure.py b/devel/libclc/files/patch-configure.py index 077d1c2a5cf9..a35e7e092469 100644 --- a/devel/libclc/files/patch-configure.py +++ b/devel/libclc/files/patch-configure.py @@ -1,12 +1,23 @@ +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) @@ -16,7 +27,7 @@ ${LOCALBASE}/lib for the needed libs. (prepare-builtins is not installed) 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]) diff --git a/devel/libclc/pkg-plist b/devel/libclc/pkg-plist index 84d1af1175f4..6fa283c5892e 100644 --- a/devel/libclc/pkg-plist +++ b/devel/libclc/pkg-plist @@ -120,47 +120,33 @@ 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 @@ -185,20 +171,17 @@ 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 @@ -207,9 +190,8 @@ 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 @@ -217,28 +199,22 @@ 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 @@ -300,6 +276,9 @@ 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