patch to fix gcc compile error gflags
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/c008b7ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/c008b7ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/c008b7ad Branch: refs/heads/dist-patch Commit: c008b7ad3b2333f7ea2bf4eae1967ce4ef31726d Parents: 4437b9d Author: cramja <marc.spehlm...@gmail.com> Authored: Tue Feb 28 09:49:57 2017 -0600 Committer: cramja <marc.spehlm...@gmail.com> Committed: Tue Feb 28 09:49:57 2017 -0600 ---------------------------------------------------------------------- third_party/download_and_patch_prerequisites.sh | 1 + third_party/patches/gflags/gflags_reporting.cc.patch | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c008b7ad/third_party/download_and_patch_prerequisites.sh ---------------------------------------------------------------------- diff --git a/third_party/download_and_patch_prerequisites.sh b/third_party/download_and_patch_prerequisites.sh index fd6106c..d16d4de 100755 --- a/third_party/download_and_patch_prerequisites.sh +++ b/third_party/download_and_patch_prerequisites.sh @@ -99,6 +99,7 @@ patch ${THIRD_PARTY_SRC_DIR}/linenoise/linenoise.c ${PATCH_DIR}/linenoise/lineno echo "Patching for gflags:" cd ${THIRD_PARTY_SRC_DIR}/gflags patch -p0 < ${PATCH_DIR}/gflags/CMakeLists.patch +patch src/gflags_reporting.cc ${PATCH_DIR}/gflags/gflags_reporting.cc.patch cd ${THIRD_PARTY_SRC_DIR} # Apply re2 patch. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c008b7ad/third_party/patches/gflags/gflags_reporting.cc.patch ---------------------------------------------------------------------- diff --git a/third_party/patches/gflags/gflags_reporting.cc.patch b/third_party/patches/gflags/gflags_reporting.cc.patch new file mode 100644 index 0000000..3e33e37 --- /dev/null +++ b/third_party/patches/gflags/gflags_reporting.cc.patch @@ -0,0 +1,4 @@ +129c129 +< assert(chars_left == strlen(c_string)); // Unless there's a \0 in there? +--- +> assert(static_cast<size_t>(chars_left) == strlen(c_string)); // Unless there's a \0 in there?