From e6570147c4699518af50d2b08190290003d33aa8 Mon Sep 17 00:00:00 2001
From: ruanjiandong <ruanjiandong@gmail.com>
Date: Thu, 14 Jun 2018 17:05:01 -0700
Subject: opencv interop fix: exclude libjpeg symbols from
 libtensorflow_framew… (#19966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* opencv interop fix: exclude libjpeg symbols from libtensorflow_framework.so to avoid symbol conflict

* Fix buildifier issue (sorting of fields)
---
 tensorflow/BUILD | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tensorflow/BUILD')

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 6d134dbb80..d77f04139e 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -451,6 +451,15 @@ filegroup(
 tf_cc_shared_object(
     name = "libtensorflow_framework.so",
     framework_so = [],
+    linkopts = select({
+        "//tensorflow:darwin": [],
+        "//tensorflow:windows": [],
+        "//tensorflow:windows_msvc": [],
+        "//conditions:default": [
+            "-Wl,--version-script",  #  This line must be directly followed by the version_script.lds file
+            "$(location //tensorflow:tf_framework_version_script.lds)",
+        ],
+    }),
     linkstatic = 1,
     visibility = ["//visibility:public"],
     deps = [
@@ -460,6 +469,7 @@ tf_cc_shared_object(
         "//tensorflow/core/grappler/optimizers:custom_graph_optimizer_registry_impl",
         "//tensorflow/core:lib_internal_impl",
         "//tensorflow/stream_executor:stream_executor_impl",
+        "//tensorflow:tf_framework_version_script.lds",
     ] + tf_additional_binary_deps(),
 )
 
-- 
cgit v1.2.3