Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-06-13 13:58:14 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-06-14 19:43:43 (GMT) |
| commit | 1dbcf543910b85b53a95461ed4770264e0ddbc4c (patch) | |
| tree | 0878c2c53987b9e4d49b92351033388606b622d2 /BuildTools | |
| parent | 316dadfb879b875dd3298b7ff221a05582014ac2 (diff) | |
| download | swift-1dbcf543910b85b53a95461ed4770264e0ddbc4c.zip swift-1dbcf543910b85b53a95461ed4770264e0ddbc4c.tar.bz2 | |
Re-enable support for system libminiupnpc and libnatpmp
Test-Information:
Unit and integration tests pass with system libs on Debian 8.5.
Change-Id: Ibcf7a1e07071d5de10c9d99c9b38e67b747f45eb
Diffstat (limited to 'BuildTools')
| -rwxr-xr-x | BuildTools/InstallSwiftDependencies.sh | 2 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/BuildTools/InstallSwiftDependencies.sh b/BuildTools/InstallSwiftDependencies.sh index 7017b5f..2c1570f 100755 --- a/BuildTools/InstallSwiftDependencies.sh +++ b/BuildTools/InstallSwiftDependencies.sh @@ -10,7 +10,7 @@ then SYSTEM_DISTRO=$(lsb_release -i -s) if [ "$SYSTEM_DISTRO" == "Debian" ] then - sudo apt-get install pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools + sudo apt-get install pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools libminiupnpc-dev libnatpmp-dev elif [ "$SYSTEM_DISTRO" == "Ubuntu" ] then sudo apt-get install pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index c3e64ee..70cd9d8 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -436,8 +436,7 @@ if env["experimental_ft"] : libminiupnpc_flags["CPPPATH"] = [env["libminiupnpc_includedir"]] libminiupnpc_conf_env.MergeFlags(libminiupnpc_flags) conf = Configure(libminiupnpc_conf_env) - if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) and False : - # ^ False because APIs aren't stable + if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) : env["HAVE_LIBMINIUPNPC"] = 1 env["LIBMINIUPNPC_FLAGS"] = { "LIBS": ["miniupnpc"] } env["LIBMINIUPNPC_FLAGS"].update(libminiupnpc_flags) @@ -457,8 +456,7 @@ if env["experimental_ft"] : libnatpmp_flags["CPPPATH"] = [env["libnatpmp_includedir"]] libnatpmp_conf_env.MergeFlags(libnatpmp_flags) conf = Configure(libnatpmp_conf_env) - if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) and False: - # ^ False because APIs aren't stable + if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) : env["HAVE_LIBNATPMP"] = 1 env["LIBNATPMP_FLAGS"] = { "LIBS": ["natpmp"] } env["LIBNATPMP_FLAGS"].update(libnatpmp_flags) |