Skip to content

Commit fe14c43

Browse files
authored
Merge pull request FloopCZ#196 from FloopCZ/patch-as-patch-command
Use PATCH_COMMAND for tensorflow patching
2 parents d4a7ff2 + 703920e commit fe14c43

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

tensorflow_cc/cmake/TensorflowShared.cmake

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,21 @@ ExternalProject_Add(
1010
BUILD_IN_SOURCE 1
1111
DOWNLOAD_COMMAND ""
1212
UPDATE_COMMAND ""
13-
# The grpc integrated in v1.15.0 needs patching, see https://github.com/clearlinux/distribution/issues/1151.
14-
CONFIGURE_COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/patches/v1.15.0-Rename-gettid-functions.patch" .
15-
COMMAND git apply v1.15.0-Rename-gettid-functions.patch
16-
COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/patches/v1.15.0-workspace.bzl.patch" .
17-
COMMAND git apply v1.15.0-workspace.bzl.patch
18-
COMMAND tensorflow/contrib/makefile/compile_linux_protobuf.sh
19-
# Do not fail on warnings when building nsync
20-
COMMAND sed -i "s/ -Werror//g" tensorflow/contrib/makefile/compile_nsync.sh
21-
COMMAND tensorflow/contrib/makefile/compile_nsync.sh
22-
COMMAND "${CMAKE_CURRENT_BINARY_DIR}/build_tensorflow.sh"
23-
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy_links.sh" .
24-
# For some reason, Bazel sometimes puts the headers into
25-
# `bazel-genfiles/genfiles` and sometimes just to `bazel-genfiles`.
26-
# So we just create and include both the directories.
27-
COMMAND mkdir -p bazel-genfiles/genfiles
28-
COMMAND touch bazel-genfiles/_placeholder.h
29-
COMMAND touch bazel-genfiles/genfiles/_placeholder.h
30-
BUILD_COMMAND ""
31-
INSTALL_COMMAND ""
13+
# The grpc integrated in v1.15.0 needs patching, see https://github.com/clearlinux/distribution/issues/1151.
14+
PATCH_COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/patches/v1.15.0-Rename-gettid-functions.patch" .
15+
COMMAND git apply v1.15.0-Rename-gettid-functions.patch
16+
COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/patches/v1.15.0-workspace.bzl.patch" .
17+
COMMAND git apply v1.15.0-workspace.bzl.patch
18+
CONFIGURE_COMMAND tensorflow/contrib/makefile/compile_linux_protobuf.sh
19+
# Do not fail on warnings when building nsync
20+
COMMAND sed -i "s/ -Werror//g" tensorflow/contrib/makefile/compile_nsync.sh
21+
COMMAND tensorflow/contrib/makefile/compile_nsync.sh
22+
BUILD_COMMAND "${CMAKE_CURRENT_BINARY_DIR}/build_tensorflow.sh"
23+
INSTALL_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy_links.sh" .
24+
# For some reason, Bazel sometimes puts the headers into
25+
# `bazel-genfiles/genfiles` and sometimes just to `bazel-genfiles`.
26+
# So we just create and include both the directories.
27+
COMMAND mkdir -p bazel-genfiles/genfiles
28+
COMMAND touch bazel-genfiles/_placeholder.h
29+
COMMAND touch bazel-genfiles/genfiles/_placeholder.h
3230
)

0 commit comments

Comments
 (0)