Skip to content

Commit 2c92634

Browse files
authored
Merge pull request #271 from Coldwings/main
fix workflow release dependencies
2 parents 970dbb3 + 6e105e3 commit 2c92634

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/release/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ elif [[ ${OS} =~ "centos" ]]; then
5050
fi
5151

5252
yum install -y epel-release libaio-devel libcurl-devel openssl-devel libnl3-devel e2fsprogs-devel
53-
yum install -y rpm-build make git wget sudo
54-
yum install --skip-broken -y libzstd-static libzstd-devel
53+
yum install -y rpm-build make git wget sudo autoconf automake libtool
54+
yum install --skip-broken -y libzstd-static gcc gcc-c++ binutils libzstd-devel
5555
elif [[ ${OS} =~ "mariner" ]]; then
5656
yum install -y libaio-devel libcurl-devel openssl-devel libnl3-devel e2fsprogs-devel glibc-devel libzstd-devel binutils ca-certificates-microsoft build-essential
57-
yum install -y rpm-build make git wget sudo tar gcc gcc-c++
57+
yum install -y rpm-build make git wget sudo tar gcc gcc-c++ autoconf automake libtool
5858

5959
DISTRO=${OS/:/.}
6060
PACKAGE_RELEASE="-DPACKAGE_RELEASE=1.${DISTRO}"

CMake/FindCURL.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,18 @@ if(${BUILD_CURL_FROM_SOURCE})
2121
OUTPUT ${curl_bundle_BINARY_DIR}/lib/libcurl.a
2222
WORKING_DIRECTORY ${curl_bundle_SOURCE_DIR}
2323
COMMAND
24+
export CC=${CMAKE_C_COMPILER} &&
25+
export CXX=${CMAKE_CXX_COMPILER} &&
26+
export LD=${CMAKE_LINKER} &&
27+
export CFLAGS=-fPIC &&
2428
autoreconf -i && sh configure --with-openssl --without-libssh2
2529
--enable-static --enable-shared=no --enable-optimize
2630
--enable-symbol-hiding --disable-manual --without-libidn
31+
--disable-ftp --disable-file --disable-ldap --disable-ldaps
32+
--disable-rtsp --disable-dict --disable-telnet --disable-tftp
33+
--disable-pop3 --disable-imap --disable-smb --disable-smtp
34+
--disable-gopher --without-nghttp2 --enable-http
35+
--with-pic=PIC
2736
--prefix=${curl_bundle_BINARY_DIR} && make -j && make install)
2837
add_custom_target(libcurl_static_build
2938
DEPENDS ${curl_bundle_BINARY_DIR}/lib/libcurl.a)

0 commit comments

Comments
 (0)