Repository: incubator-quickstep Updated Branches: refs/heads/master 64bd2c9ae -> 2e7f446bd
simplify logic of download script Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/2e7f446b Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/2e7f446b Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/2e7f446b Branch: refs/heads/master Commit: 2e7f446bdcb6f6f065e93befcf8c7b3d437cc4c4 Parents: 64bd2c9 Author: cramja <marc.spehlm...@gmail.com> Authored: Sat Mar 4 09:28:03 2017 -0600 Committer: cramja <marc.spehlm...@gmail.com> Committed: Sat Mar 4 09:28:03 2017 -0600 ---------------------------------------------------------------------- third_party/download_and_patch_prerequisites.sh | 23 +++++++------------- 1 file changed, 8 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/2e7f446b/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 d16d4de..d5ab48a 100755 --- a/third_party/download_and_patch_prerequisites.sh +++ b/third_party/download_and_patch_prerequisites.sh @@ -88,6 +88,9 @@ do fi done +# Back to the third_party directory. +cd ${THIRD_PARTY_DIR} + # Apply patches now. # Apply linenoise patch @@ -96,22 +99,12 @@ patch ${THIRD_PARTY_SRC_DIR}/linenoise/linenoise.h ${PATCH_DIR}/linenoise/lineno patch ${THIRD_PARTY_SRC_DIR}/linenoise/linenoise.c ${PATCH_DIR}/linenoise/linenoise.c.patch # Apply gflags patch. -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} +patch ${THIRD_PARTY_SRC_DIR}/gflags/CMakeLists.txt ${PATCH_DIR}/gflags/CMakeLists.patch +patch ${THIRD_PARTY_SRC_DIR}/gflags/src/gflags_reporting.cc ${PATCH_DIR}/gflags/gflags_reporting.cc.patch # Apply re2 patch. -cd ${THIRD_PARTY_SRC_DIR}/re2 -patch -p0 < ${PATCH_DIR}/re2/re2CMake.patch -cd ${THIRD_PARTY_SRC_DIR} +patch ${THIRD_PARTY_SRC_DIR}/re2/CMakeLists.txt ${PATCH_DIR}/re2/re2CMake.patch # Apply benchmark patches. -cd ${THIRD_PARTY_SRC_DIR}/benchmark -patch -p0 < ${PATCH_DIR}/benchmark/benchmarkCMake.patch -cd ${THIRD_PARTY_SRC_DIR}/benchmark/src -patch -p0 < ${PATCH_DIR}/benchmark/benchmarkSrcCMakeLists.patch - -# Back to the third_party directory. -cd ${THIRD_PARTY_DIR} +patch ${THIRD_PARTY_SRC_DIR}/benchmark/CMakeLists.txt ${PATCH_DIR}/benchmark/benchmarkCMake.patch +patch ${THIRD_PARTY_SRC_DIR}/benchmark/src/CMakeLists.txt ${PATCH_DIR}/benchmark/benchmarkSrcCMakeLists.patch