Date: Wednesday, November 20, 2019 @ 17:45:42 Author: svenstaro Revision: 530748
upgpkg: tensorflow 2.0.0-6 Rebuild against bazel 1.1.0 Added: tensorflow/trunk/bazel1.patch Modified: tensorflow/trunk/PKGBUILD --------------+ PKGBUILD | 5 + bazel1.patch | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-20 16:26:21 UTC (rev 530747) +++ PKGBUILD 2019-11-20 17:45:42 UTC (rev 530748) @@ -7,7 +7,7 @@ pkgname=(tensorflow tensorflow-opt tensorflow-cuda tensorflow-opt-cuda python-tensorflow python-tensorflow-opt python-tensorflow-cuda python-tensorflow-opt-cuda) pkgver=2.0.0 _pkgver=2.0.0 -pkgrel=5 +pkgrel=6 pkgdesc="Library for computation using data flow graphs for scalable machine learning" url="https://www.tensorflow.org/"; license=('APACHE') @@ -19,10 +19,12 @@ optdepends=('tensorboard: Tensorflow visualization toolkit' 'python-pasta: tf_upgrade_v2 tool') source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"; + 'bazel1.patch' 'python-3.8.patch' 'glibc-2.30.patch' '33953.patch') sha512sums=('c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc' + '5fc101eb0278504b55d71868ef62ae8ada9bd490b544a95124a0dae08c2891b28e3fb476b200fed08b36273ede5ebe923e1c0bb389e45476c68e5c168adf0184' 'ef06196f1a7f5a4dff4d83916566dae8f2f2c2993ddcd40017583020dd9bfc73ef426c45b0cc5630d1dd53321b99736f2c60b37bb9370be02174c1209e041ffb' 'a9345b7206e9f8ae9fc33987997808dcdeaf3e4c05caf40785bba2a9ef2292e20046bfd54ce05fee2ccd11ded9d8e918b2a131d830a7e238406e6ddf222e830e' 'ad06e7553e1a6961ac53eed626c8a390c5dc8967cb172cc07ccc45e4ccef495c15e4a273c469df957a0971c64d9585b3493ff74e863a4f6f53a1e1f676b45870') @@ -35,6 +37,7 @@ patch -Np1 -d tensorflow-${_pkgver} <python-3.8.patch patch -Np1 -d tensorflow-${_pkgver} <glibc-2.30.patch patch -Np1 -d tensorflow-${_pkgver} <33953.patch + patch -Np1 -d tensorflow-${_pkgver} <bazel1.patch cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-cuda Added: bazel1.patch =================================================================== --- bazel1.patch (rev 0) +++ bazel1.patch 2019-11-20 17:45:42 UTC (rev 530748) @@ -0,0 +1,167 @@ +diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD +index f740ba66b5..6cc9003787 100644 +--- a/tensorflow/c/BUILD ++++ b/tensorflow/c/BUILD +@@ -270,6 +270,7 @@ tf_cuda_library( + "//tensorflow/core/platform", + "@com_google_absl//absl/strings", + ], ++ alwayslink = 1, + ) + + exports_files( +diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD +index 0c869f0c8b..6bb7e7512d 100644 +--- a/tensorflow/c/eager/BUILD ++++ b/tensorflow/c/eager/BUILD +@@ -79,6 +79,7 @@ tf_cuda_library( + "//tensorflow/core/profiler/lib:profiler_session", + "//tensorflow/core:gpu_runtime", + ], ++ alwayslink = 1, + ) + + tf_cuda_library( +@@ -225,6 +226,7 @@ tf_cuda_library( + "//tensorflow/core/profiler/rpc/client:capture_profile", + "//tensorflow/core:gpu_runtime", + ], ++ alwayslink = 1, + ) + + tf_cuda_cc_test( +diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD +index 39b84922d1..b2affdd999 100644 +--- a/tensorflow/cc/saved_model/BUILD ++++ b/tensorflow/cc/saved_model/BUILD +@@ -123,6 +123,7 @@ cc_library( + "//tensorflow/core/util/tensor_bundle:naming", + # mobile not supported yet + ]), ++ alwayslink = 1, + ) + + tf_cc_test( +diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD +index 5194c7be65..9bd4ca5a37 100644 +--- a/tensorflow/core/BUILD ++++ b/tensorflow/core/BUILD +@@ -355,6 +355,7 @@ cc_library( + ":platform_base", + "//third_party/eigen3", + ], ++ alwayslink = 1, + ) + + filegroup( +@@ -798,6 +799,7 @@ cc_library( + ":lib_proto_parsing", + ":protos_all_cc", + ], ++ alwayslink = 1, + ) + + cc_library( +@@ -2500,6 +2502,7 @@ cc_library( + "@com_google_protobuf//:protobuf", + ] + tf_protos_all_impl() + tf_protos_grappler_impl() + + tf_additional_numa_deps(), ++ alwayslink = 1, + ) + + # File compiled with extra flags to get cpu-specific acceleration. +diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl +index 6404fde550..567a1acede 100644 +--- a/tensorflow/core/platform/default/build_config.bzl ++++ b/tensorflow/core/platform/default/build_config.bzl +@@ -228,6 +228,7 @@ def cc_proto_library( + hdrs = gen_hdrs, + deps = cc_libs + deps, + includes = includes, ++ alwayslink = 1, + **kargs + ) + native.cc_library( +diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD +index 4d15517c30..cec349231f 100644 +--- a/tensorflow/lite/kernels/BUILD ++++ b/tensorflow/lite/kernels/BUILD +@@ -564,6 +564,7 @@ cc_library( + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + ], ++ alwayslink = 1, + ) + + # The builtin_ops target will resolve to optimized kernels when available. This +diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD +index c5fac20d38..dc77f1ab90 100644 +--- a/tensorflow/python/BUILD ++++ b/tensorflow/python/BUILD +@@ -466,6 +466,7 @@ cc_library( + "//tensorflow/core:script_ops_op_lib", + "//third_party/python_runtime:headers", + ], ++ alwayslink = 1, + ) + + cc_library( +@@ -616,6 +617,7 @@ cc_library( + "//tensorflow/core:op_gen_lib", + "//tensorflow/core:protos_all_cc", + ], ++ alwayslink = 1, + ) + + py_library( +diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl +index 97b10bf0d8..65cc206e03 100644 +--- a/tensorflow/tensorflow.bzl ++++ b/tensorflow/tensorflow.bzl +@@ -2323,6 +2323,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = [] + hdrs = out_hdrs, + visibility = visibility, + deps = deps, ++ alwayslink = 1, + ) + + def tf_genrule_cmd_append_to_srcs(to_append): +diff --git a/third_party/protobuf/protobuf.patch b/third_party/protobuf/protobuf.patch +index df0648563d..18fc6cdf35 100644 +--- a/third_party/protobuf/protobuf.patch ++++ b/third_party/protobuf/protobuf.patch +@@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644 + + ################################################################################ + # Protobuf Runtime Library +-@@ -218,7 +218,7 @@ cc_library( ++@@ -209,6 +209,7 @@ cc_library( ++ copts = COPTS, ++ includes = ["src/"], ++ linkopts = LINK_OPTS, +++ alwayslink = 1, ++ visibility = ["//visibility:public"], ++ deps = [":protobuf_lite"] + PROTOBUF_DEPS, ++ ) ++@@ -219,7 +220,7 @@ cc_library( + # TODO(keveman): Remove this target once the support gets added to Bazel. + cc_library( + name = "protobuf_headers", +@@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644 + includes = ["src/"], + visibility = ["//visibility:public"], + ) ++ +\ No newline at end of file +diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl +index 774514f3fd..1c415b018b 100644 +--- a/third_party/systemlibs/protobuf.bzl ++++ b/third_party/systemlibs/protobuf.bzl +@@ -262,6 +262,7 @@ def cc_proto_library( + hdrs = gen_hdrs, + deps = cc_libs + deps, + includes = includes, ++ alwayslink = 1, + **kargs + ) +
