git: b2cbf77dab15 - main - graphics/vulkan-loader: drop aarch64 workaround after b8ac6f84f44c
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 01 Jan 2022 23:47:08 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b2cbf77dab15df1d8418b174fee14ee6a02e8b3e
commit b2cbf77dab15df1d8418b174fee14ee6a02e8b3e
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-01 23:44:07 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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)