From fc711abda02f64e2b3aff5bb07b5280b542968bc Mon Sep 17 00:00:00 2001 From: mehrdadn Date: Sat, 9 Jul 2016 06:06:21 +0300 Subject: [PATCH] Remove parquet for Windows -- we don't need it yet (#240) --- thirdparty/download_thirdparty.bat | 2 -- thirdparty/patches/windows/parquet-endian.patch | 12 ------------ 2 files changed, 14 deletions(-) delete mode 100644 thirdparty/patches/windows/parquet-endian.patch diff --git a/thirdparty/download_thirdparty.bat b/thirdparty/download_thirdparty.bat index 889291dc6..9970fc741 100644 --- a/thirdparty/download_thirdparty.bat +++ b/thirdparty/download_thirdparty.bat @@ -4,7 +4,6 @@ @If Not Exist "grpc\.git" git clone "https://github.com/grpc/grpc" @If Not Exist "arrow\.git" git clone "https://github.com/pcmoritz/arrow.git" --branch windows_with_submodules --recursive @If Not Exist "arrow\cpp\thirdparty\flatbuffers\.git" git clone "https://github.com/google/flatbuffers.git" "arrow/cpp/thirdparty/flatbuffers" - @If Not Exist "arrow\cpp\thirdparty\parquet\.git" git clone "https://github.com/apache/parquet-cpp.git" "arrow/cpp/thirdparty/parquet" @If Not Exist "numbuf\.git" git clone "https://github.com/amplab/numbuf.git" --branch win @If Not Exist "python\.git" git clone "https://github.com/austinsc/python.git" git -C "grpc" submodule update --init "third_party/protobuf" @@ -14,7 +13,6 @@ git -C "grpc" apply --index --3way "%~dp0patches/windows/grpc-projects.patch" git -C "grpc/third_party/protobuf" apply --index --3way "%~dp0patches/windows/protobuf-projects.patch" git -C "arrow/cpp/thirdparty/flatbuffers" apply --index --3way "%~dp0patches/windows/flatbuffers-projects.patch" - git -C "arrow/cpp/thirdparty/parquet" apply --index --3way "%~dp0patches/windows/parquet-endian.patch" git -C "python" apply --index --3way "%~dp0patches/windows/python-pyconfig.patch" @PopD @EndLocal diff --git a/thirdparty/patches/windows/parquet-endian.patch b/thirdparty/patches/windows/parquet-endian.patch deleted file mode 100644 index 9d5c5ff44..000000000 --- a/thirdparty/patches/windows/parquet-endian.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/endian.h b/src/endian.h -new file -index e69de29..4d9eb94 ---- /dev/null -+++ b/src/endian.h -@@ -0,0 +1,6 @@ -+#ifdef _MSC_VER -+#define __builtin_expect(x, z) (x) -+#define __builtin_bswap16(x) _byteswap_ushort(x) -+#define __builtin_bswap32(x) _byteswap_ulong(x) -+#define __builtin_bswap64(x) _byteswap_uint64(x) -+#endif