Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Dec 2020 04:09:16 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559270 - in head/graphics/shaderc: . files
Message-ID:  <202012260409.0BQ49Gk1005635@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Dec 26 04:09:15 2020
New Revision: 559270
URL: https://svnweb.freebsd.org/changeset/ports/559270

Log:
  graphics/shaderc: unbreak 11.4 and GCC architectures after r559203
  
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(PoolAlloc.cpp.o): in function `glslang::GetThreadPoolAllocator()':
  PoolAlloc.cpp:(.text+0xf): undefined reference to `glslang::OS_GetTLSValue(void*)'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(PoolAlloc.cpp.o): in function `glslang::SetThreadPoolAllocator(glslang::TPoolAllocator*)':
  PoolAlloc.cpp:(.text+0x33): undefined reference to `glslang::OS_SetTLSValue(void*, void*)'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(PoolAlloc.cpp.o): in function `glslang::InitializePoolIndex()':
  PoolAlloc.cpp:(.text+0x45): undefined reference to `glslang::OS_AllocTLSIndex()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `ShInitialize':
  ShaderLang.cpp:(.text+0x7): undefined reference to `glslang::InitGlobalLock()'
  /usr/bin/ld.bfd: ShaderLang.cpp:(.text+0xe): undefined reference to `glslang::InitProcess()'
  /usr/bin/ld.bfd: ShaderLang.cpp:(.text+0x17): undefined reference to `glslang::GetGlobalLock()'
  /usr/bin/ld.bfd: ShaderLang.cpp:(.text+0x22): undefined reference to `glslang::ReleaseGlobalLock()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `ShConstructCompiler':
  ShaderLang.cpp:(.text+0x7d): undefined reference to `glslang::InitThread()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `ShConstructLinker':
  ShaderLang.cpp:(.text+0xad): undefined reference to `glslang::InitThread()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `ShConstructUniformMap':
  ShaderLang.cpp:(.text+0xd5): undefined reference to `glslang::InitThread()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `ShFinalize':
  ShaderLang.cpp:(.text+0x192): undefined reference to `glslang::GetGlobalLock()'
  /usr/bin/ld.bfd: ShaderLang.cpp:(.text+0x1ae): undefined reference to `glslang::ReleaseGlobalLock()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `glslang::TShader::parse(TBuiltInResource const*, int, EProfile, bool, bool, EShMessages, glslang::TShader::Includer&)':
  ShaderLang.cpp:(.text+0x2ee4): undefined reference to `glslang::InitThread()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `glslang::TShader::preprocess(TBuiltInResource const*, int, EProfile, bool, bool, EShMessages, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*, glslang::TShader::Includer&)':
  ShaderLang.cpp:(.text+0x3019): undefined reference to `glslang::InitThread()'
  /usr/bin/ld.bfd: /usr/local/lib/libMachineIndependent.a(ShaderLang.cpp.o): in function `(anonymous namespace)::SetupBuiltinSymbolTable(int, EProfile, glslang::SpvVersion const&, glslang::EShSource)':
  ShaderLang.cpp:(.text+0x6acc): undefined reference to `glslang::GetGlobalLock()'
  /usr/bin/ld.bfd: ShaderLang.cpp:(.text+0x6b54): undefined reference to `glslang::ReleaseGlobalLock()'
  /usr/bin/ld.bfd: ShaderLang.cpp:(.text+0x7d5e): undefined reference to `glslang::ReleaseGlobalLock()'
  c++: error: linker command failed with exit code 1 (use -v to see invocation)
  
  Reported by:	pkg-fallout

Modified:
  head/graphics/shaderc/Makefile   (contents, props changed)
  head/graphics/shaderc/files/patch-system-glslang   (contents, props changed)

Modified: head/graphics/shaderc/Makefile
==============================================================================
--- head/graphics/shaderc/Makefile	Sat Dec 26 01:50:47 2020	(r559269)
+++ head/graphics/shaderc/Makefile	Sat Dec 26 04:09:15 2020	(r559270)
@@ -3,6 +3,7 @@
 PORTNAME=	shaderc
 DISTVERSIONPREFIX=v
 DISTVERSION=	2020.4
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org

Modified: head/graphics/shaderc/files/patch-system-glslang
==============================================================================
--- head/graphics/shaderc/files/patch-system-glslang	Sat Dec 26 01:50:47 2020	(r559269)
+++ head/graphics/shaderc/files/patch-system-glslang	Sat Dec 26 04:09:15 2020	(r559270)
@@ -12,7 +12,7 @@ ld: error: undefined symbol: ConstructCompiler(EShLang
  
  target_link_libraries(glslc PRIVATE
 -  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
-+  glslang MachineIndependent GenericCodeGen             # Glslang libraries
++  glslang MachineIndependent GenericCodeGen OSDependent OGLCompiler # Glslang libraries
    $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
    shaderc_util shaderc                                  # internal Shaderc libraries
    ${CMAKE_THREAD_LIBS_INIT})



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012260409.0BQ49Gk1005635>