From nobody Fri Nov 26 18:37:50 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 01BDE18A7BAF; Fri, 26 Nov 2021 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J13QQ2zVmz3rBw; Fri, 26 Nov 2021 18:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41C8A58BE; Fri, 26 Nov 2021 18:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AQIbokf035999; Fri, 26 Nov 2021 18:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQIbo92035998; Fri, 26 Nov 2021 18:37:50 GMT (envelope-from git) Date: Fri, 26 Nov 2021 18:37:50 GMT Message-Id: <202111261837.1AQIbo92035998@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ff26131d838e - main - devel/intel-graphics-compiler: switch to proposed upstream llvm12 fix List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff26131d838e0f7745580375b4abebb7ed93ea97 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637951870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnbhT2EbVzUZKEBkeZ8Ub45WUvGNB98Kvaq8NzIsR6M=; b=CNGZPj/VMHz471I/iQfAntLoiQBp35753GhQTRjABAZtewqChmLaNNoLFSaqY+mpTAya9k +/ySRtvMRZeN9T5WDUczIExdyA3P5ab4aznFJbCzddLFViyPVMlnf/obYS9TxNzblwPV5W CpqSGO8ahOPAAx1mz2V6w8zgq+cwdHCtpaGjMOwgISem8TkYOwm0mCPVrYOqSmAvpsqXHC IC3LHP41JC2T8QVY61NXYL3Pr0MWvN/kJveOvpZNhQVm7ZEhYFKuvnlkPmIlRl+K6Amota uDqUCmM7Nh1KWE40V/3bkRcXUYNnAj9XJBy2ofxPDeeOM7rQqmDjEvrpDJwciA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637951870; a=rsa-sha256; cv=none; b=XhsPxFggd+w8R0cxcBs4artKbEqlmzOfhR1Yw9FkKSGDi4i28aVDvvKr30WdEu6nimVQzY G/YjQ/fnED7fvWcxrmRYTlGY585lb0HciMd832rrKkdIf4QpEHaxsI4upi8l2fKHpbbnaX zGP8bt5hLDGEg9/xxDVlh5Xwjfhztdaw4xPyqIfZ9TBVcbbNxOW9tKBxVLUFRtJjx92IWT 2JNr2TZZ78y0JoABB4fzuFTfjlyFIbgrw0yN6OerFM4bzLh/EwctHfAgt+OK0fj7YkOfzO vx32gKpfQYSk7NdfWr1fNQO38JBvESK5SarOqcYnmP4Zu4PqOODQG9X8LSfVIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff26131d838e0f7745580375b4abebb7ed93ea97 commit ff26131d838e0f7745580375b4abebb7ed93ea97 Author: Jan Beich AuthorDate: 2021-11-26 17:42:45 +0000 Commit: Jan Beich CommitDate: 2021-11-26 18:37:41 +0000 devel/intel-graphics-compiler: switch to proposed upstream llvm12 fix --- devel/intel-graphics-compiler/Makefile | 1 + devel/intel-graphics-compiler/distinfo | 2 ++ devel/intel-graphics-compiler/files/patch-llvm12 | 22 ---------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 7ea82934a77e..834397a833db 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -5,6 +5,7 @@ CATEGORIES= devel PKGNAMESUFFIX= -${FLAVOR} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= aa7df33aebe0.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/210 PATCHFILES+= 99edbf49d7c9.patch:-p1 # clang MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index 80773a109b84..c958e9ab3b76 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -5,5 +5,7 @@ SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.g SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402 SHA256 (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c SIZE (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = 2887505 +SHA256 (aa7df33aebe0.patch) = b2da1a00ac59ce7e98fd6cfb554f8974b1500bc1b9973387181414ffa4cffea5 +SIZE (aa7df33aebe0.patch) = 2242 SHA256 (99edbf49d7c9.patch) = c7a96b5629384422ff2d848624ac60d5cc6dffd0289bce430df1ba813a45474c SIZE (99edbf49d7c9.patch) = 1151 diff --git a/devel/intel-graphics-compiler/files/patch-llvm12 b/devel/intel-graphics-compiler/files/patch-llvm12 deleted file mode 100644 index 68e7995988dd..000000000000 --- a/devel/intel-graphics-compiler/files/patch-llvm12 +++ /dev/null @@ -1,22 +0,0 @@ -CMake Error at external/llvm/llvm_deps.cmake:50 (file): - file COPY cannot find - "IGC/DEFAULT_IGC_LLVM_SOURCES_DIR-NOTFOUND/libunwind/include/mach-o/compact_unwind_encoding.h": - No such file or directory. -Call Stack (most recent call first): - IGC/CMakeLists.txt:1250 (include) - ---- external/llvm/llvm_deps.cmake.orig 2021-09-16 08:50:38 UTC -+++ external/llvm/llvm_deps.cmake -@@ -44,12 +44,6 @@ include(llvm_spirv_source_hook) - # LLD source hook. - if(IGC_OPTION__LLVM_LLD) - include(llvm_lld_source_hook) -- if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0") -- # Need to copy one header from unwind package for LLD (only for building from sources) -- file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o) -- file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h -- DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/) -- endif() - endif() - - # Process LLVM.