mirror of
https://framagit.org/tom79/fedilab-tube
synced 2025-06-05 21:09:11 +02:00
try
This commit is contained in:
@@ -198,12 +198,6 @@ prepare_openssl() {
|
||||
wget -4 --no-check-certificate -O openssl.tar.gz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
|
||||
tar xvfz openssl.tar.gz
|
||||
rm -f openssl.tar.gz
|
||||
# avoid GDI dependency in windows, fix double return statement on threads_none.c
|
||||
if [[ $os_build == "windows" ]]; then
|
||||
sed -i 's/if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333/if 0/g' ${OPENSSL_SOURCE}/crypto/cryptlib.c;
|
||||
sed -i 's/MessageBox.*//g' ${OPENSSL_SOURCE}/crypto/cryptlib.c;
|
||||
sed -i 's/return return 0;/return 0;/g' ${OPENSSL_SOURCE}/crypto/threads_none.c;
|
||||
fi
|
||||
popd
|
||||
fi
|
||||
}
|
||||
@@ -222,18 +216,6 @@ build_openssl() {
|
||||
make -j 8
|
||||
make install_sw
|
||||
popd
|
||||
fi
|
||||
if [[ $os_build == "windows" ]]; then
|
||||
pushd ${OPENSSL_ROOT}/lib
|
||||
if [ -L libcrypto.lib ]; then
|
||||
rm libcrypto.lib
|
||||
fi
|
||||
if [ -L libssl.lib ]; then
|
||||
rm libssl.lib
|
||||
fi
|
||||
ln -s libcrypto.a libcrypto.lib
|
||||
ln -s libssl.a libssl.lib
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -272,10 +254,6 @@ build_libraries() {
|
||||
abort_if_var_unset "run_readelf" ${run_readelf}
|
||||
set -x
|
||||
cd ${SWIG}
|
||||
if [[ $os_build == "windows" && $os_arch == "x86" ]]; then
|
||||
pwd
|
||||
sed -i 's/ JNICALL Java_com_frostwire/ JNICALL _Java_com_frostwire/g' libtorrent_jni.cpp;
|
||||
fi
|
||||
export PATH=${PATH}:${BOOST_ROOT}/tools/build/src/engine
|
||||
echo "Added boost tools to PATH:"
|
||||
echo ${PATH}
|
||||
@@ -286,20 +264,6 @@ build_libraries() {
|
||||
$run_bjam
|
||||
$run_objcopy
|
||||
$run_strip
|
||||
|
||||
# fix libjlibtorrent.dll -> jlibtorrent.dll
|
||||
if [[ $os_build == "windows" ]]; then
|
||||
cp bin/release/windows/${os_arch}/libjlibtorrent.dll bin/release/windows/${os_arch}/jlibtorrent.dll
|
||||
fi
|
||||
|
||||
cd ..
|
||||
|
||||
# so that tests pass when running on mac or linux we copy the shared library to the root folder
|
||||
if [[ $os_build == "macosx" || $os_build == "linux" ]]; then
|
||||
cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} .
|
||||
fi
|
||||
gradle clean
|
||||
gradle build
|
||||
}
|
||||
|
||||
cleanup_objects() {
|
||||
|
Reference in New Issue
Block a user