Merge pull request #179 from johnhaddon/oslVisibilityFix

OpenShadingLanguage : Apply symbol visibility patch
GafferHQ · Feb 18, 2021 · b366e88 · b366e88
2 parents e61001e + b4cd151
commit b366e88
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 23 deletions.
diff --git a/Appleseed/patches/oslLibraries.patch b/Appleseed/patches/oslLibraries.patch
diff --git a/OpenShadingLanguage/patches/visibilityMap.patch b/OpenShadingLanguage/patches/visibilityMap.patch
@@ -0,0 +1,60 @@
+commit de8c484d88d533c0fe8568908b92da05c29c8cb9
+Author: Larry Gritz <[email protected]>
+Date:   Wed Feb 17 23:40:38 2021 -0800
+
+    Typo prevented visibility hiding from happening properly
+
+    Signed-off-by: Larry Gritz <[email protected]>
+
+diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt
+index 2d646d96..7cb34287 100644
+--- a/src/liboslcomp/CMakeLists.txt
++++ b/src/liboslcomp/CMakeLists.txt
+@@ -54,7 +54,7 @@ set_target_properties (${local_lib}
+     )
+
+
+-if (VISIBILITY_COMMAND)
++if (VISIBILITY_MAP_COMMAND)
+     set_property (TARGET ${local_lib}
+                   APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND})
+ endif ()
+diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
+index 52c444fd..5349da6c 100644
+--- a/src/liboslexec/CMakeLists.txt
++++ b/src/liboslexec/CMakeLists.txt
+@@ -248,7 +248,7 @@ set_target_properties (${local_lib}
+         OUTPUT_NAME ${local_lib}${OSL_LIBNAME_SUFFIX}
+     )
+
+-if (VISIBILITY_COMMAND)
++if (VISIBILITY_MAP_COMMAND)
+     set_property (TARGET ${local_lib}
+                   APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND})
+ endif ()
+diff --git a/src/liboslquery/CMakeLists.txt b/src/liboslquery/CMakeLists.txt
+index 1143e59b..0419d1ae 100644
+--- a/src/liboslquery/CMakeLists.txt
++++ b/src/liboslquery/CMakeLists.txt
+@@ -31,7 +31,7 @@ set_target_properties (${local_lib}
+         POSITION_INDEPENDENT_CODE ON
+     )
+
+-if (VISIBILITY_COMMAND)
++if (VISIBILITY_MAP_COMMAND)
+     set_property (TARGET ${local_lib}
+                   APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND})
+ endif ()
+diff --git a/src/osl.imageio/CMakeLists.txt b/src/osl.imageio/CMakeLists.txt
+index 48d21345..70214bc3 100644
+--- a/src/osl.imageio/CMakeLists.txt
++++ b/src/osl.imageio/CMakeLists.txt
+@@ -44,7 +44,7 @@ macro (add_oiio_plugin)
+                            PROPERTIES
+                                PREFIX ""
+                                FOLDER "Plugins")
+-    if (VISIBILITY_COMMAND)
++    if (VISIBILITY_MAP_COMMAND)
+         set_property (TARGET ${_plugin_name}
+                       APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND})
+     endif ()