From nobody Sat Jan 1 23:48:08 2022 X-Original-To: dev-commits-ports-branches@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 DE651193F2A7; Sat, 1 Jan 2022 23:48:08 +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 4JRJbr4hQsz3jC7; Sat, 1 Jan 2022 23:48:08 +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 76F4C27C1B; Sat, 1 Jan 2022 23:48:08 +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 201Nm8lm009901; Sat, 1 Jan 2022 23:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 201Nm8wT009900; Sat, 1 Jan 2022 23:48:08 GMT (envelope-from git) Date: Sat, 1 Jan 2022 23:48:08 GMT Message-Id: <202201012348.201Nm8wT009900@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 00018a6752e9 - 2022Q1 - graphics/vulkan-loader: drop aarch64 workaround after b8ac6f84f44c List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 00018a6752e9882701c74c24006afb813a458b95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641080888; 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=U/6g3NoBxkVsw0roDeSC5d0MR4Qvs7HXZfi9fMzFV4s=; b=VSgXe5AkhWLG1tyol6xZh5wNBfWq2QCabDl3BHc7EukVzoKBEHzrOyUAERyfczXV2iaP0Z +b53DyWD4mGO0cIDvVt0c8lwZj6/wDvfAV3fmPIl9doiRkXp4iUsmCtgasSUxSEVVYKOK3 jPOj9Sj84B/AMSToJe2xgjQ8cD/L32iIeWSeKPcItDnHSk7B+5bV13vLvdvono6w3CZTA1 XV4opYrS86SJliZ5Xvu8+3i9OoeC8OVxHsTSFHjVp7kt8+CxP1NdgZ2uxjnYYXyx7qAKI2 UG9JDCsGNFyU2rvgzYgB1aot0pocjWbk4pB9ofKKuk0QC6mzjkJogKASUG9YmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641080888; a=rsa-sha256; cv=none; b=lIZX1YDpN4Z9YuqegSODrZSztHmQKeWEQ+mELFfJpex1YgOfOGUbW6/bRmRwZ6Jk9ARb7J H4uVaN8Q2fvv97dh/pOZBchiqIAiArRC6419pFCwFfJ5cHL3ElU9mAy7kmWgcyMejB4/Wr 5w+joo17l2WZqafViGMDwOwfpbYO3a9Of0fP+xe5OmRdzo274wmBnOnk2TqertP1m8+iSA XtQL43NIwI+cm4/zXUGuPWBO3H4d6OEBWaUzJ2cGEhUJWWqNsFWeo80nQtx3hpvw6gQ1rc dMzUzZUXokB9YTFUV4pJzLCOfmV9irja9EXd16kIkSuwdwUa+b4ikniWEnxnkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=00018a6752e9882701c74c24006afb813a458b95 commit 00018a6752e9882701c74c24006afb813a458b95 Author: Jan Beich AuthorDate: 2022-01-01 23:44:07 +0000 Commit: Jan Beich CommitDate: 2022-01-01 23:48:04 +0000 graphics/vulkan-loader: drop aarch64 workaround after b8ac6f84f44c https://github.com/KhronosGroup/Vulkan-Loader/commit/a11162fcaca8 (cherry picked from commit b2cbf77dab15df1d8418b174fee14ee6a02e8b3e) --- graphics/vulkan-loader/files/patch-loader_CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt index 366f5122fb72..a5b7d269fa6f 100644 --- a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt +++ b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt @@ -1,7 +1,3 @@ -ld: error: can't create dynamic relocation R_AARCH64_ABS64 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output ->>> defined in loader/CMakeFiles/vulkan.dir/unknown_ext_chain_gas_aarch64.S.o ->>> referenced by loader/CMakeFiles/vulkan.dir/unknown_ext_chain_gas_aarch64.S.o:(.text+0x61A8) - -- The ASM compiler identification is Clang -- Found assembler: /usr/bin/cc CMake Warning at loader/CMakeLists.txt:252 (message): @@ -19,22 +15,18 @@ CMake Error at loader/CMakeLists.txt:332 (target_compile_definitions): Cannot specify compile definitions for target "asm_offset" which is not built by this project. ---- loader/CMakeLists.txt.orig 2021-11-16 19:22:26 UTC +--- loader/CMakeLists.txt.orig 2021-12-20 16:46:42 UTC +++ loader/CMakeLists.txt -@@ -228,8 +228,11 @@ else(UNIX AND NOT APPLE) # i.e.: Linux - try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/asm_test_aarch64.S) +@@ -229,7 +229,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux if(ASSEMBLER_WORKS) set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas_aarch64.S) -+ if(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,notext") -+ endif() endif() - elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86") + elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86$|i.86") check_include_file("cet.h" HAVE_CET_H) if(HAVE_CET_H) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS HAVE_CET_H) -@@ -329,7 +332,9 @@ else() +@@ -330,7 +330,9 @@ else() target_compile_definitions(vulkan PRIVATE _GNU_SOURCE) if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") target_compile_definitions(vulkan PRIVATE __BSD_VISIBLE=1)