xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

apr: use tarball to avoid ./buildconf

This commit is contained in:
Minglei Jin 2023-08-09 13:03:37 +08:00
parent 398567ef4c
commit 7e2859ed43
5 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/apr-util_CMakeLists.txt.in
View File

@ -1,12 +1,16 @@
# apr-util
ExternalProject_Add(aprutil-1
GIT_REPOSITORY https://github.com/apache/apr-util.git
GIT_TAG 1.5.4
URL https://dlcdn.apache.org//apr/apr-util-1.6.3.tar.gz
URL_HASH SHA256=2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983
DOWNLOAD_NO_PROGRESS 1
DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
#GIT_REPOSITORY https://github.com/apache/apr-util.git
#GIT_TAG 1.5.4
SOURCE_DIR "${TD_CONTRIB_DIR}/apr-util"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
#BINARY_DIR ""
BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --with-apr=${CMAKE_BINARY_DIR}/build
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""
)

21
cmake/apr_CMakeLists.txt.in
View File

@ -1,12 +1,19 @@
# apr
ExternalProject_Add(apr-1
GIT_REPOSITORY https://github.com/apache/apr.git
GIT_TAG 1.5.2
URL https://dlcdn.apache.org//apr/apr-1.7.4.tar.gz
URL_HASH SHA256=a4137dd82a185076fa50ba54232d920a17c6469c30b0876569e1c2a05ff311d9
DOWNLOAD_NO_PROGRESS 1
DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
#GIT_REPOSITORY https://github.com/apache/apr.git
#GIT_TAG 1.5.2
SOURCE_DIR "${TD_CONTRIB_DIR}/apr"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
#BINARY_DIR "${CMAKE_BINARY_DIR}/build"
BUILD_IN_SOURCE TRUE
#CONFIGURE_COMMAND ""
#BUILD_COMMAND ""
#INSTALL_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""
)

9
cmake/curl_CMakeLists.txt.in
View File

@ -3,10 +3,9 @@ ExternalProject_Add(curl
GIT_REPOSITORY https://github.com/curl/curl.git
GIT_TAG curl-7_88_1
SOURCE_DIR "${TD_CONTRIB_DIR}/curl"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""
)

2
contrib/CMakeLists.txt
View File

@ -125,10 +125,10 @@ endif(${BUILD_WITH_SQLITE})
# cos
if(${BUILD_WITH_COS})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
cat("${TD_SUPPORT_DIR}/cos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
add_definitions(-DUSE_COS)
endif(${BUILD_WITH_COS})

16
source/dnode/vnode/CMakeLists.txt
View File

@ -135,10 +135,10 @@ else()
endif()
endif()
#find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
#find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
#find_library(MINIXML_LIBRARY mxml)
#find_library(CURL_LIBRARY curl)
find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
find_library(MINIXML_LIBRARY mxml)
find_library(CURL_LIBRARY curl)
target_link_libraries(
vnode
@ -162,10 +162,10 @@ target_link_libraries(
# s3
cos_c_sdk
apr-1
aprutil-1
mxml
curl
${APR_UTIL_LIBRARY}
${APR_LIBRARY}
${MINIXML_LIBRARY}
${CURL_LIBRARY}
)
IF (TD_GRANT)