You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
1.9 KiB
64 lines
1.9 KiB
Index: src/build-data/makefile/unix.in |
|
--- src/build-data/makefile/unix.in.orig 2016-11-28 11:52:20.000000000 +0100 |
|
+++ src/build-data/makefile/unix.in 2016-12-11 19:48:52.835622000 +0100 |
|
@@ -16,8 +16,8 @@ |
|
|
|
BINDIR = $(DESTDIR)/bin |
|
LIBDIR = $(DESTDIR)/%{libdir} |
|
-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan |
|
-DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) |
|
+HEADERDIR = $(DESTDIR)/%{includedir}/botan |
|
+DOCDIR = $(DESTDIR)/%{docdir} |
|
PKGCONF_DIR = $(LIBDIR)/pkgconfig |
|
|
|
CONFIG_SCRIPT = %{botan_config} |
|
Index: src/utils/cpuid.cpp |
|
--- src/utils/cpuid.cpp.orig 2016-11-28 11:52:20.000000000 +0100 |
|
+++ src/utils/cpuid.cpp 2016-12-11 19:48:52.850722000 +0100 |
|
@@ -24,7 +24,7 @@ |
|
|
|
#endif |
|
|
|
-#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) |
|
+#if 0 |
|
|
|
#if defined(BOTAN_BUILD_COMPILER_IS_MSVC) |
|
|
|
Index: src/utils/safeint.h |
|
--- src/utils/safeint.h.orig 2016-11-28 11:52:20.000000000 +0100 |
|
+++ src/utils/safeint.h 2016-12-11 19:55:55.729786000 +0100 |
|
@@ -11,13 +11,21 @@ |
|
#include <botan/exceptn.h> |
|
#include <string> |
|
|
|
+#include <sstream> |
|
+ |
|
+template <typename T> std::string my_to_string(const T& n) { |
|
+ std::ostringstream stm; |
|
+ stm << n; |
|
+ return stm.str(); |
|
+} |
|
+ |
|
namespace Botan { |
|
|
|
class Integer_Overflow_Detected : public Exception |
|
{ |
|
public: |
|
Integer_Overflow_Detected(const std::string& file, int line) : |
|
- Exception("Integer overflow detected at " + file + ":" + std::to_string(line)) |
|
+ Exception("Integer overflow detected at " + file + ":" + to_string(line)) |
|
{} |
|
}; |
|
|
|
Index: src/utils/types.h |
|
--- src/utils/types.h.orig 2016-11-28 11:52:20.000000000 +0100 |
|
+++ src/utils/types.h 2016-12-11 19:48:52.835870000 +0100 |
|
@@ -43,7 +43,7 @@ |
|
typedef unsigned __int64 u64bit; |
|
#elif defined(__KCC) |
|
typedef unsigned __long_long u64bit; |
|
-#elif defined(__GNUG__) |
|
+#elif defined(__GNUC__) |
|
__extension__ typedef unsigned long long u64bit; |
|
#else |
|
typedef unsigned long long u64bit;
|
|
|