aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/botan
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2012-10-16 15:07:16 +0200
committerEike Ziller <eike.ziller@digia.com>2012-10-16 19:02:23 +0200
commit55c44bf238b26805a74a16038c8738ca8ccfb612 (patch)
treeda56b733072fdd601b4ea625c6dd31f580db5bbb /src/libs/3rdparty/botan
parentf6d5ba9b1a66dda3b1e19a03d7e3b2da4f0642be (diff)
SSH: Link Botan objects into libQtcSsh.
Using Botan as a shared library is dangerous due to the use of dynamic_cast and exceptions, which both reproducibly fail to work on MacOs. Since there are no other users of Botan, we just add its objects to the SSH library. Change-Id: Ic79f081d2e1231a52feef02ef5b68761692f1110 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/libs/3rdparty/botan')
-rw-r--r--src/libs/3rdparty/botan/botan.pri46
-rw-r--r--src/libs/3rdparty/botan/botan.pro53
-rw-r--r--src/libs/3rdparty/botan/botan.qbs70
3 files changed, 45 insertions, 124 deletions
diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
index 20832c1a7aa..7845d6081ef 100644
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -1,2 +1,46 @@
INCLUDEPATH *= $$PWD/..
-LIBS *= -l$$qtLibraryName(Botan)
+HEADERS += $$PWD/botan.h
+SOURCES += $$PWD/botan.cpp
+
+CONFIG += exceptions
+
+DEPENDPATH += .
+
+DEFINES += BOTAN_DLL="\"\""
+unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
+ BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
+ BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
+*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
+ BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
+ BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
+macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
+*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
+*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
+*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
+
+win32 {
+ DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \
+ BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \
+ BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \
+ BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
+ BOTAN_HAS_MUTEX_WIN32
+
+ win32-msvc* {
+ QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
+ DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S
+ } else {
+ QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
+ QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
+ }
+ LIBS += -ladvapi32 -luser32
+}
+
+unix:*-g++* {
+ QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
+ QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
+ QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
+}
+
+linux*|freebsd* {
+ LIBS += -lrt
+}
diff --git a/src/libs/3rdparty/botan/botan.pro b/src/libs/3rdparty/botan/botan.pro
deleted file mode 100644
index 92f2bd0f6a1..00000000000
--- a/src/libs/3rdparty/botan/botan.pro
+++ /dev/null
@@ -1,53 +0,0 @@
-TEMPLATE = lib
-TARGET = Botan
-
-PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h
-
-CONFIG += exceptions
-
-include(../../../qtcreatorlibrary.pri)
-
-DEPENDPATH += .
-INCLUDEPATH += .
-
-DEFINES += BOTAN_DLL=Q_DECL_EXPORT
-unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
- BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
- BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
-*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
- BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
- BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
-macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
-*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
-*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
-*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
-
-win32 {
- DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \
- BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \
- BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \
- BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
- BOTAN_HAS_MUTEX_WIN32
-
- win32-msvc* {
- QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
- DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S
- } else {
- QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
- QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
- }
- LIBS += -ladvapi32 -luser32
-}
-
-unix:*-g++* {
- QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
- QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
- QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
-}
-
-HEADERS += botan.h
-SOURCES += botan.cpp
-
-linux*|freebsd* {
- LIBS += -lrt
-}
diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
deleted file mode 100644
index ee8afc1d033..00000000000
--- a/src/libs/3rdparty/botan/botan.qbs
+++ /dev/null
@@ -1,70 +0,0 @@
-import qbs.base 1.0
-import "../../QtcLibrary.qbs" as QtcLibrary
-
-QtcLibrary {
- name: "Botan"
-
- Depends { name: "cpp" }
- Depends { name: "Qt.core" }
-
- cpp.includePaths: '.'
- cpp.dynamicLibraries: {
- if (qbs.targetOS == "windows") {
- return [
- "advapi32",
- "user32"
- ]
- } else {
- return ["rt", "dl"]
- }
- }
-
- cpp.defines: {
- var result = ["BOTAN_DLL=Q_DECL_EXPORT"]
- if (qbs.toolchain == "msvc")
- result.push("BOTAN_BUILD_COMPILER_IS_MSVC", "BOTAN_TARGET_OS_HAS_GMTIME_S")
- if (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")
- result.push("BOTAN_BUILD_COMPILER_IS_GCC")
- if (qbs.targetOS == "linux")
- result.push("BOTAN_TARGET_OS_IS_LINUX", "BOTAN_TARGET_OS_HAS_CLOCK_GETTIME",
- "BOTAN_TARGET_OS_HAS_DLOPEN", " BOTAN_TARGET_OS_HAS_GMTIME_R",
- "BOTAN_TARGET_OS_HAS_POSIX_MLOCK", "BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE",
- "BOTAN_HAS_DYNAMIC_LOADER", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY",
- "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
- "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
- "BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO")
- if (qbs.targetOS == "mac")
- result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY",
- "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
- "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
- "BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO")
- if (qbs.targetOS == "windows")
- result.push("BOTAN_TARGET_OS_IS_WINDOWS",
- "BOTAN_TARGET_OS_HAS_LOADLIBRARY", "BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME",
- "BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK", "BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE",
- "BOTAN_HAS_DYNAMIC_LOADER", "BOTAN_HAS_ENTROPY_SRC_CAPI",
- "BOTAN_HAS_ENTROPY_SRC_WIN32", "BOTAN_HAS_MUTEX_WIN32")
- return base.concat(result)
- }
-
- Properties {
- condition: qbs.toolchain == "mingw"
- cpp.cxxFlags: [
- "-fpermissive",
- "-finline-functions",
- "-Wno-long-long"
- ]
- }
-
- files: [ "botan.h", "botan.cpp" ]
-
- ProductModule {
- Depends { name: "cpp" }
- cpp.linkerFlags: {
- if (qbs.toolchain == "mingw") {
- return ["-Wl,--enable-auto-import"]
- }
- }
- cpp.includePaths: '..'
- }
-}