diff --git a/.circleci/config.yml b/.circleci/config.yml index adfb1648f..c09384729 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,8 +7,8 @@ jobs: - checkout - run: | cd trunk && - ./configure --without-rtc --without-gb28181 --without-utest && make && - ./configure --with-rtc --with-gb28181 --with-utest && make clean && make + ./configure --without-rtc --without-gb28181 --without-utest --without-srtp-nasm && make && + ./configure --with-rtc --with-gb28181 --with-utest --with-srtp-nasm && make clean && make test: docker: - image: ossrs/srs:dev @@ -16,7 +16,7 @@ jobs: - checkout - run: | cd trunk && - ./configure --with-rtc --with-gb28181 --with-utest --gcov && make && + ./configure --with-rtc --with-gb28181 --with-srtp-nasm --with-utest--gcov && make && ./objs/srs_utest && bash auto/coverage.sh workflows: version: 2 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 283494ddc..8e0a4a818 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -476,14 +476,21 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then # https://stackoverflow.com/questions/15539062/cross-compiling-of-openssl-for-linux-arm-v5te-linux-gnueabi-toolchain if [[ $SRS_CROSS_BUILD == YES ]]; then OPENSSL_CONFIG="./Configure linux-armv4" - else - # If not crossbuild, try to use exists libraries. - if [[ -f /usr/local/lib64/libssl.a && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then + elif [[ ! -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then + # Try to use files for openssl 1.1.* + if [[ -f /usr/local/lib64/libssl.a ]]; then (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && ln -sf /usr/local/lib64/libssl.a && ln -sf /usr/local/lib64/libcrypto.a) (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && ln -sf /usr/local/include/openssl) fi + # Try to use files for openssl 1.0.* + if [[ -f /usr/local/ssl/lib/libssl.a ]]; then + (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && + ln -sf /usr/local/lib/libssl.a && ln -sf /usr/local/lib/libcrypto.a) + (mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/include && + ln -sf /usr/local/ssl/include/openssl) + fi fi # For RTC, we should use ASM to improve performance, not a little improving. if [[ $SRS_RTC == NO || $SRS_NASM == NO ]]; then