commit 6063a5cd014679106ea2630e1a7ed533480fe08c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 29 16:22:34 2020 +0100
Update glslang linker patch
glslang_linker_flags.patch | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/glslang_linker_flags.patch b/glslang_linker_flags.patch
index e132dd8..9826b50 100644
--- a/glslang_linker_flags.patch
+++ b/glslang_linker_flags.patch
@@ -1,12 +1,33 @@
+From 98ea1a662ee172961feaa374fe8d26078838d250 Mon Sep 17 00:00:00 2001
+From: Philip Langdale <philipl(a)overt.org>
+Date: Mon, 17 Aug 2020 16:19:39 -0700
+Subject: [PATCH] configure: Add additional glslang libraries to make linking
+ work
+
+The latest builds of glslang introduce new libraries that need to be
+linked for all symbols to be fully resolved.
+
+This change will break building against older installations of glslang
+and it's very hard to tell them apart as the library change upstream
+was not accompanied by any version bump and no official release has
+been made with this change it - just lots of people packaging up git
+snapshots. So, apologies in advance.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 9ff246b..f13d1a8 100755
--- a/configure
+++ b/configure
-@@ -6308,7 +6308,7 @@
+@@ -6308,7 +6308,7 @@ enabled fontconfig && enable libfontconfig
enabled libfontconfig && require_pkg_config libfontconfig fontconfig
"fontconfig/fontconfig.h" FcInit
enabled libfreetype && require_pkg_config libfreetype freetype2
"ft2build.h FT_FREETYPE_H" FT_Init_FreeType
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h
fribidi_version_info
-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h
"glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
-+enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h
"glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lMachineIndependent
-lGenericCodeGen -lpthread -lstdc++
++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h
"glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL
-lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools
-lpthread -lstdc++
enabled libgme && { check_pkg_config libgme libgme gme/gme.h
gme_new_emu ||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
enabled libgsm && { for gsm_hdr in "gsm.h"
"gsm/gsm.h"; do
-
+--
+2.7.4
Show replies by date