From 16fb35fe6f9949b1646a361ea75a99263e110685 Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Thu, 26 Dec 2019 20:47:08 +0800 Subject: [PATCH] Update build scripts --- scripts/build.alpine.release.sh | 7 +------ scripts/build.macos.release.sh | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh index acc073c..9233514 100644 --- a/scripts/build.alpine.release.sh +++ b/scripts/build.alpine.release.sh @@ -3,7 +3,7 @@ mkdir obj set -xe apk add gcc g++ build-base linux-headers cmake make autoconf automake libtool -apk add libressl-dev zlib-dev rapidjson-dev libevent-dev libevent-static zlib-static pcre-dev +apk add libressl-dev zlib-dev rapidjson-dev libevent-dev libevent-static zlib-static pcre-dev bzip2-static git clone https://github.com/curl/curl cd curl @@ -18,11 +18,6 @@ cmake . > /dev/null make install -j4 > /dev/null cd .. -git clone git://sourceware.org/git/bzip2.git -cd bzip2 -make install -j4 > /dev/null -cd .. - cmake . make -j4 g++ -o base/subconverter CMakeFiles/subconverter.dir/src/*.o -static -lpcrecpp -lpcre -levent -lyaml-cpp -lcurl -lssl -lcrypto -lz -lbz2 -ldl -lpthread -O3 -s diff --git a/scripts/build.macos.release.sh b/scripts/build.macos.release.sh index f5a5d4e..dbce492 100644 --- a/scripts/build.macos.release.sh +++ b/scripts/build.macos.release.sh @@ -25,7 +25,7 @@ cp /usr/local/lib/libyaml-cpp.a . cp /usr/local/lib/libpcre.a . cp /usr/local/lib/libpcrecpp.a . -export CMAKE_CXX_FLAGS=-D_MACOS -I/usr/local/include -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/curl/include +export CMAKE_CXX_FLAGS="-D_MACOS -I/usr/local/include -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/curl/include" cmake . make -j8 c++ -Xlinker -unexported_symbol -Xlinker "*" -o base/subconverter obj/logger.o obj/main.o obj/misc.o obj/multithread.o obj/nodemanip.o obj/rapidjson_extra.o obj/speedtestutil.o obj/subexport.o obj/webget.o obj/webserver_libevent.o libpcrecpp.a libpcre.a libevent.a curl/lib/.libs/libcurl.a libz.a libssl.a libcrypto.a libyaml-cpp.a bzip2-1.0.6/libbz2.a -ldl -lpthread -O3