From nobody Sat Jan 01 23:47:08 2022 X-Original-To: dev-commits-ports-all@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 1C9A1193E444; Sat, 1 Jan 2022 23:47:09 +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 4JRJZh5slcz3hrr; Sat, 1 Jan 2022 23:47: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 9992A278D7; Sat, 1 Jan 2022 23:47: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 201Nl8V6009656; Sat, 1 Jan 2022 23:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 201Nl8pF009655; Sat, 1 Jan 2022 23:47:08 GMT (envelope-from git) Date: Sat, 1 Jan 2022 23:47:08 GMT Message-Id: <202201012347.201Nl8pF009655@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: b2cbf77dab15 - main - graphics/vulkan-loader: drop aarch64 workaround after b8ac6f84f44c List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: b2cbf77dab15df1d8418b174fee14ee6a02e8b3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641080828; 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=1lmn7T7fN6AyIE9Ln5X6HrIQ9VfYkuWyk3/xDlaT8BQ=; b=r3+ifyvqEnc6eO1oH/ns84udkuhZgJsu7GxKjMwAUsvoZl8+OpTUXUztAfK2LFwWRv/BFv f77tzbR4beAllxrvkE0U2999z6knU/93e4nXI3KcumqgwTbGXCUqPAyy7ItDHrV1c7F0zC WDH/HgKmeNbKHi37/UlY2ctFvdNWtNwq2HFyCmcsgZHx5JEcwuzBJactkCYrhYOeQJ+gsR 0o7yjusRWnomgof38fQxAIZrGNV135EUvy7vQ4K1GwHdOv4QEAq7JzPDn9f0QxA4zmLkFP WCsGv0sunOFyYh81rGlMdelsHdzWs6HEPNvHaX+WeO6ciXqrROeC2Yt5tdHWQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641080828; a=rsa-sha256; cv=none; b=yOFdQ+RcnH15PNLA5Ol7XpYz0mZ7uVHG3KYB6bHZFMOfNfCiGk2BlrqwzGw4ZBl71BVHh6 KPgJtcwNuLPcAslmz+FiObRogYqKrddj2uEk5UD7fhStPax94fDW9A89IMTEtwGnKYZaXy u1qPcQx6wWf4s/MC6aQMtfUqhw3IZ9tXESSoxD6bR9/5F+UEYbQLu6Dr3tdy1bHLgyuzM5 yNRq4LAtVaNe/rMjDOOS3bwi3HbXYG3rBuM7IxzjmIbMhyrAjvh/U7iKt1liq5vNF65YsQ 5R5lzz/RElILfSJ88L1bVL63bvcgnUWGYJ9gsL9vtkFcvyD2gTjbJfanQJ7bLA== 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=b2cbf77dab15df1d8418b174fee14ee6a02e8b3e commit b2cbf77dab15df1d8418b174fee14ee6a02e8b3e Author: Jan Beich AuthorDate: 2022-01-01 23:44:07 +0000 Commit: Jan Beich CommitDate: 2022-01-01 23:46:35 +0000 graphics/vulkan-loader: drop aarch64 workaround after b8ac6f84f44c https://github.com/KhronosGroup/Vulkan-Loader/commit/a11162fcaca8 --- 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)