diff options
Diffstat (limited to 'ports/orc')
| -rw-r--r-- | ports/orc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/orc/no-werror.patch | 16 | ||||
| -rw-r--r-- | ports/orc/portfile.cmake | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL index 1cb8967ed..4cb08a814 100644 --- a/ports/orc/CONTROL +++ b/ports/orc/CONTROL @@ -1,4 +1,4 @@ Source: orc -Version: 1.5.5 +Version: 1.5.5-1 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest Description: The smallest, fastest columnar storage for Hadoop workloads. diff --git a/ports/orc/no-werror.patch b/ports/orc/no-werror.patch new file mode 100644 index 000000000..d2572612f --- /dev/null +++ b/ports/orc/no-werror.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4484e373..87b5ed41 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,9 +81,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-covered-switch-default") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-missing-noreturn -Wno-unknown-pragmas") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") +- set (WARN_FLAGS "${WARN_FLAGS} -Wconversion -Werror") ++ set (WARN_FLAGS "${WARN_FLAGS} -Wconversion") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion -Werror") ++ set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion") + if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR + CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") + set (CXX11_FLAGS "-std=c++0x") diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index e72f9fd69..f993755e9 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( HEAD_REF master PATCHES 0003-dependencies-from-vcpkg.patch - ) + no-werror.patch +) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake") |