diff --git a/.gitignore b/.gitignore index d37c4cf413db1f8ae354e559a237a3bb089ae35a..5c36708f88f02030b96b57d3fc113a7daf4b832b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ _CPack_Packages *.gcno *.gcda *.gcov -patches/ +/patches/ .git-ignore/ .pc/ coverity/ diff --git a/static-build/cmake/AddDependencyProjects.cmake b/static-build/cmake/AddDependencyProjects.cmake index 2edbd797414cdec9d1cc50eba1be42fd92ff3c2c..bb68c52c301e0867a4667fbef0c8b30cf1aa3188 100644 --- a/static-build/cmake/AddDependencyProjects.cmake +++ b/static-build/cmake/AddDependencyProjects.cmake @@ -50,6 +50,8 @@ set(DEPENDENCY_LDFLAGS "${DEPENDENCY_LDFLAGS} ${HARDENING_LDFLAGS}") set(DEPENDENCY_CFLAGS "${DEPENDENCY_CFLAGS} ${PREFIX_MAP_FLAGS}") set(DEPENDENCY_CXXFLAGS "${DEPENDENCY_CXXFLAGS} ${PREFIX_MAP_FLAGS}") +set(PATCHES_DIR "${CMAKE_CURRENT_LIST_DIR}/../patches") + # Install all libraries required by tarantool at current build dir # @@ -73,7 +75,7 @@ ExternalProject_Add(openssl no-shared INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install_sw PATCH_COMMAND patch -d <SOURCE_DIR> -p1 < - "${CMAKE_CURRENT_LIST_DIR}/../openssl-111q-gh-18720.patch" + "${PATCHES_DIR}/openssl-111q-gh-18720.patch" ) set(TARANTOOL_DEPENDS openssl ${TARANTOOL_DEPENDS}) @@ -184,7 +186,7 @@ ExternalProject_Add(readline --prefix=<INSTALL_DIR> --disable-shared PATCH_COMMAND patch -d <SOURCE_DIR> -p0 < - "${CMAKE_CURRENT_LIST_DIR}/../readline80-001.patch" + "${PATCHES_DIR}/readline80-001.patch" ) set(TARANTOOL_DEPENDS readline ${TARANTOOL_DEPENDS}) diff --git a/static-build/openssl-111q-gh-18720.patch b/static-build/patches/openssl-111q-gh-18720.patch similarity index 100% rename from static-build/openssl-111q-gh-18720.patch rename to static-build/patches/openssl-111q-gh-18720.patch diff --git a/static-build/readline80-001.patch b/static-build/patches/readline80-001.patch similarity index 100% rename from static-build/readline80-001.patch rename to static-build/patches/readline80-001.patch