Skip to content
Snippets Groups Projects
Commit e3918801 authored by Adrien Béraud's avatar Adrien Béraud Committed by Andreas Traczyk
Browse files

contrib: remove cryptopp


Change-Id: I2ce2bdbc87d8c0de4cebbb3cc00e4a76286aee82
Reviewed-by: default avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 07e4c5d7
No related branches found
No related tags found
No related merge requests found
......@@ -447,7 +447,7 @@
</Command>
</PreBuildEvent>
<Lib>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libgnutls.lib;lib_json.lib;opendht.lib;Argon2Ref.lib;pcre.lib;yaml-cpp.lib;portaudio-UWP.lib;libupnp.lib;cryptlib.lib;boost_system.lib;boost_random.lib;pjsip-core-x86_64-x64-vc14-Release.lib;pjsip-simple-x86_64-x64-vc14-Release.lib;pjsua2-lib-x86_64-x64-vc14-Release.lib;pjsua-lib-x86_64-x64-vc14-Release.lib;pjsip-ua-x86_64-x64-vc14-Release.lib;pjmedia-codec-x86_64-x64-vc14-Release.lib;pjmedia-x86_64-x64-vc14-Release.lib;pjlib-util-x86_64-x64-vc14-Release.lib;libspeex-x86_64-x64-vc14-Release.lib;pjlib-x86_64-x64-vc14-Release.lib;pjnath-x86_64-x64-vc14-Release.lib;restbed.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libgnutls.lib;lib_json.lib;opendht.lib;Argon2Ref.lib;pcre.lib;yaml-cpp.lib;portaudio-UWP.lib;libupnp.lib;boost_system.lib;boost_random.lib;pjsip-core-x86_64-x64-vc14-Release.lib;pjsip-simple-x86_64-x64-vc14-Release.lib;pjsua2-lib-x86_64-x64-vc14-Release.lib;pjsua-lib-x86_64-x64-vc14-Release.lib;pjsip-ua-x86_64-x64-vc14-Release.lib;pjmedia-codec-x86_64-x64-vc14-Release.lib;pjmedia-x86_64-x64-vc14-Release.lib;pjlib-util-x86_64-x64-vc14-Release.lib;libspeex-x86_64-x64-vc14-Release.lib;pjlib-x86_64-x64-vc14-Release.lib;pjnath-x86_64-x64-vc14-Release.lib;restbed.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin;$(ProjectDir)..\contrib\build\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\libnatpmp\msvc\x64\Release;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
......
bdb7563b8959c1a9261a3feda9d0f6a81172e12d2b34fbe761b7d60f3a5917d82d1bca285dd9d4da23e71b306ad5e2a7d283545a559c88da8118a3830487ab71 cryptopp-54557b18275053bbfc34594f7e65808dd92dd1a6.tar.gz
--- a/CMakeLists.txt 2016-09-21 02:41:26.000000000 -0400
+++ b/CMakeLists.txt 2017-07-23 09:54:00.000000000 -0400
@@ -40,11 +40,7 @@
set(LIB_VER ${cryptopp_VERSION_MAJOR}${cryptopp_VERSION_MINOR}${cryptopp_VERSION_PATCH})
# Only set when cross-compiling, http://www.vtk.org/Wiki/CMake_Cross_Compiling
-if (NOT (CMAKE_SYSTEM_VERSION AND CMAKE_SYSTEM_PROCESSOR))
- set(CRYPTOPP_CROSS_COMPILE 1)
-else()
- set(CRYPTOPP_CROSS_COMPILE 0)
-endif()
+set(CRYPTOPP_CROSS_COMPILE 1)
# Don't use RPATH's. The resulting binary could fail a security audit.
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
This diff is collapsed.
set BUILD=%SRC%..\build
set CRYPTOPP_VERSION=54557b18275053bbfc34594f7e65808dd92dd1a6
set CRYPTOPP_URL=https://github.com/weidai11/cryptopp/archive/%CRYPTOPP_VERSION%.tar.gz
mkdir %BUILD%
if %USE_CACHE%==1 (
copy %CACHE_DIR%\%CRYPTOPP_VERSION%.tar.gz %cd%
) else (
wget %CRYPTOPP_URL%
)
7z -y x %CRYPTOPP_VERSION%.tar.gz && 7z -y x %CRYPTOPP_VERSION%.tar -o%BUILD%
del %CRYPTOPP_VERSION%.tar && del %CRYPTOPP_VERSION%.tar.gz && del %BUILD%\pax_global_header
rename %BUILD%\cryptopp-%CRYPTOPP_VERSION% cryptopp
cd %BUILD%\cryptopp
git apply --reject --whitespace=fix %SRC%\cryptopp\cryptopp-uwp.patch
cd %SRC%
\ No newline at end of file
# Crypto++
CRYPTOPP_VERSION := 54557b18275053bbfc34594f7e65808dd92dd1a6
CRYPTOPP_URL := https://github.com/weidai11/cryptopp/archive/$(CRYPTOPP_VERSION).tar.gz
PKGS += cryptopp
# Debian/Ubuntu
ifeq ($(call need_pkg,'libcrypto++'),)
PKGS_FOUND += cryptopp
else
# Redhat/Fedora
ifeq ($(call need_pkg,'cryptopp'),)
PKGS_FOUND += cryptopp
endif
endif
CRYPTOPP_CMAKECONF := -DBUILD_TESTING=Off \
-DBUILD_SHARED=Off \
-DCMAKE_INSTALL_LIBDIR=lib
$(TARBALLS)/cryptopp-$(CRYPTOPP_VERSION).tar.gz:
$(call download,$(CRYPTOPP_URL))
.sum-cryptopp: cryptopp-$(CRYPTOPP_VERSION).tar.gz
cryptopp: cryptopp-$(CRYPTOPP_VERSION).tar.gz .sum-cryptopp
$(UNPACK)
ifdef HAVE_ANDROID
$(APPLY_BIN) $(SRC)/cryptopp/cmake-crosscompile.patch
endif
$(MOVE)
.cryptopp: cryptopp toolchain.cmake
cd $< && rm GNUmakefile*
cd $< && $(HOSTVARS) $(CMAKE) . $(CRYPTOPP_CMAKECONF)
cd $< && $(MAKE) install
touch $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment