Index: head/lang/intel-compute-runtime/Makefile =================================================================== --- head/lang/intel-compute-runtime/Makefile (revision 568455) +++ head/lang/intel-compute-runtime/Makefile (revision 568456) @@ -1,65 +1,64 @@ # $FreeBSD$ PORTNAME= compute-runtime -DISTVERSION= 21.09.19150 -PORTREVISION= 1 +DISTVERSION= 21.10.19208 CATEGORIES= lang PKGNAMEPREFIX= intel- PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2a423820aaa4.patch:-p1 # https://github.com/intel/compute-runtime/pull/361 PATCHFILES+= 76666662c479.patch:-p1 # https://github.com/intel/compute-runtime/issues/407 MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenCL implementation for Intel HD 5000 (Gen8) or newer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported LIB_DEPENDS= libigc.so:devel/intel-graphics-compiler \ libigdgmm.so:multimedia/gmmlib USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel CMAKE_ON= SKIP_UNIT_TESTS SUPPORT_DG1 CMAKE_ARGS= -DNEO_OCL_DRIVER_VERSION:STRING="${DISTVERSIONFULL}" PLIST_FILES= bin/ocloc \ etc/OpenCL/vendors/intel.icd \ include/ocloc_api.h \ lib/intel-opencl/libigdrcl.so \ lib/libocloc.so \ ${NULL} OPTIONS_DEFINE= VAAPI OPTIONS_DEFAULT=VAAPI OPTIONS_DEFINE_amd64= L0 OPTIONS_DEFAULT_amd64= L0 L0_DESC= oneAPI Level Zero support L0_BUILD_DEPENDS= level-zero>=1.0:devel/level-zero L0_CMAKE_BOOL= BUILD_WITH_L0 L0_CMAKE_ON= -DNEO_VERSION_BUILD:STRING="0" L0_PLIST_FILES= lib/libze_intel_gpu.so.1 \ lib/libze_intel_gpu.so.1.0.0 VAAPI_BUILD_DEPENDS= ${LOCALBASE}/include/va/va.h:multimedia/libva VAAPI_CMAKE_BOOL_OFF= DISABLE_LIBVA post-patch: @${REINPLACE_CMD} -e '/-Werror/d' \ -e '/FORCE_RESPONSE_FILE/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/OCL_ICD_VENDORDIR/s,/etc,${PREFIX}&,' \ ${WRKSRC}/package.cmake post-install: # install/strip has no effect on install(FILES), so strip manually ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/intel-opencl/*.so .include Index: head/lang/intel-compute-runtime/distinfo =================================================================== --- head/lang/intel-compute-runtime/distinfo (revision 568455) +++ head/lang/intel-compute-runtime/distinfo (revision 568456) @@ -1,7 +1,7 @@ -TIMESTAMP = 1614027337 -SHA256 (intel-compute-runtime-21.09.19150_GH0.tar.gz) = c38172bc7460cc3ec104ef29a655788cdd8329a62e894ee1ec116e78ebc451a5 -SIZE (intel-compute-runtime-21.09.19150_GH0.tar.gz) = 3780882 +TIMESTAMP = 1614619045 +SHA256 (intel-compute-runtime-21.10.19208_GH0.tar.gz) = 9950fb77c9ce56711d1d4d4554d75406ce53935f954e573d492e2f75c85e7bcf +SIZE (intel-compute-runtime-21.10.19208_GH0.tar.gz) = 3791111 SHA256 (2a423820aaa4.patch) = dd034e856e75d70bc6b63204aa2c67530a3212d111b67a703e4cbeb84e61685b SIZE (2a423820aaa4.patch) = 947 SHA256 (76666662c479.patch) = 9513b57fb156aa8394ba9a6311ae055c8bf7f5202ee77e3c90987448836dc26a SIZE (76666662c479.patch) = 7677 Index: head/lang/intel-compute-runtime/files/patch-rtld =================================================================== --- head/lang/intel-compute-runtime/files/patch-rtld (revision 568455) +++ head/lang/intel-compute-runtime/files/patch-rtld (revision 568456) @@ -1,18 +1,32 @@ RTLD_DEEPBIND isn't available on non-Linux -core/os_interface/linux/os_library_linux.cpp: In constructor 'NEO::Linux::OsLibrary::OsLibrary(const string&)': -core/os_interface/linux/os_library_linux.cpp:35:49: error: 'RTLD_DEEPBIND' was not declared in this scope - 35 | constexpr auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; - | ^~~~~~~~~~~~~ +shared/source/os_interface/linux/os_library_helper.cpp:17:24: error: use of undeclared identifier 'RTLD_DEEPBIND' + dlopenFlag &= ~RTLD_DEEPBIND; + ^ +shared/source/os_interface/linux/os_library_linux.cpp:41:39: error: use of undeclared identifier 'RTLD_DEEPBIND' + auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; + ^ ---- shared/source/os_interface/linux/os_library_linux.cpp.orig 2020-02-28 16:16:42 UTC +--- shared/source/os_interface/linux/os_library_helper.cpp.orig 2021-03-01 17:17:25 UTC ++++ shared/source/os_interface/linux/os_library_helper.cpp +@@ -14,7 +14,9 @@ namespace NEO { + namespace Linux { + void adjustLibraryFlags(int &dlopenFlag) { + if (DebugManager.flags.DisableDeepBind.get()) { ++#ifdef RTLD_DEEPBIND + dlopenFlag &= ~RTLD_DEEPBIND; ++#endif + } + } + } // namespace Linux +--- shared/source/os_interface/linux/os_library_linux.cpp.orig 2021-03-01 17:17:25 UTC +++ shared/source/os_interface/linux/os_library_linux.cpp -@@ -29,7 +29,7 @@ OsLibrary::OsLibrary(const std::string &name) { +@@ -35,7 +35,7 @@ OsLibrary::OsLibrary(const std::string &name) { if (name.empty()) { - this->handle = dlopen(0, RTLD_LAZY); + this->handle = SysCalls::dlopen(0, RTLD_LAZY); } else { -#ifdef SANITIZER_BUILD +#if defined(SANITIZER_BUILD) || !defined(RTLD_DEEPBIND) - constexpr auto dlopenFlag = RTLD_LAZY; + auto dlopenFlag = RTLD_LAZY; #else - constexpr auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; + auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND;