diff options
| author |  Avijit <Avijit.Chakraborty@intel.com> | 2018-08-12 16:21:41 -0700 |
|---|---|---|
| committer | Avijit <Avijit.Chakraborty@intel.com> | 2018-08-12 16:21:41 -0700 |
| commit | 9523a98466d16cf01fc76a67b489f1124cf626ac (patch) | |
| tree | bd4c460b67fab60c2fb1a6c56bf22d1cbb5391e6 /third_party | |
| parent | 93e950c308071071f35d6dcb35b9f91b8a34876c (diff) | |
| parent | 1a22b0b982fa1a953651b98af8f3cd30542048fd (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/jpeg/jpeg.BUILD | 2 | ||||
| -rw-r--r-- | third_party/kafka/BUILD | 37 |
2 files changed, 30 insertions, 9 deletions
diff --git a/third_party/jpeg/jpeg.BUILD b/third_party/jpeg/jpeg.BUILD index 663a218733..b36295ad06 100644 --- a/third_party/jpeg/jpeg.BUILD +++ b/third_party/jpeg/jpeg.BUILD @@ -272,8 +272,10 @@ cc_library( "jchuff.h", "jconfig.h", "jdct.h", + "jerror.h", "jinclude.h", "jmorecfg.h", + "jpegint.h", "jpeglib.h", "jsimd.h", "jsimddct.h", diff --git a/third_party/kafka/BUILD b/third_party/kafka/BUILD index 75792b0d87..3c50b8cf52 100644 --- a/third_party/kafka/BUILD +++ b/third_party/kafka/BUILD @@ -15,6 +15,7 @@ cc_library( "src-cpp/KafkaConsumerImpl.cpp", "src-cpp/MessageImpl.cpp", "src-cpp/MetadataImpl.cpp", + "src-cpp/ProducerImpl.cpp", "src-cpp/QueueImpl.cpp", "src-cpp/RdKafka.cpp", "src-cpp/TopicImpl.cpp", @@ -130,7 +131,15 @@ cc_library( "src/tinycthread.h", "src/xxhash.c", "src/xxhash.h", - ], + ] + select({ + "@org_tensorflow//tensorflow:windows": [ + "src/rdkafka_sasl_win32.c", + "src/rdwin32.h", + "src/regexp.c", + "src/regexp.h", + ], + "//conditions:default": [], + }), hdrs = [ "config.h", "src-cpp/rdkafkacpp.h", @@ -138,15 +147,25 @@ cc_library( "src/lz4.c", "src/snappy_compat.h", ], - copts = [ - "-Iexternal/kafka/src", - "-Iexternal/kafka/src-cpp", - ], - defines = [ - ], - linkopts = [ - "-lpthread", + copts = select({ + "@org_tensorflow//tensorflow:windows": [ + "-DWIN32_LEAN_AND_MEAN", + "-DWITHOUT_WIN32_CONFIG", + "-DWITH_ZLIB=1", + "-DWITH_SSL=1", + "-DWITH_SNAPPY=1", + ], + "//conditions:default": [], + }), + defines = ["LIBRDKAFKA_STATICLIB"], + includes = [ + "src", + "src-cpp", ], + linkopts = select({ + "@org_tensorflow//tensorflow:windows": ["-defaultlib:crypt32.lib"], + "//conditions:default": ["-lpthread"], + }), visibility = ["//visibility:public"], deps = [ "@boringssl//:ssl", |