| 123456789101112131415161718192021222324252627282930313233343536373839 |
- Index: src/build-data/makefile/unix.in
- --- src/build-data/makefile/unix.in.orig 2011-06-03 17:00:14.000000000 +0200
- +++ src/build-data/makefile/unix.in 2011-06-04 11:13:54.000000000 +0200
- @@ -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 2011-06-03 17:00:14.000000000 +0200
- +++ src/utils/cpuid.cpp 2011-06-04 11:07:29.000000000 +0200
- @@ -14,7 +14,7 @@
- #include <sys/sysctl.h>
- #endif
-
- -#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
- +#if 0
-
- #if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
-
- Index: src/utils/types.h
- --- src/utils/types.h.orig 2011-06-03 17:00:14.000000000 +0200
- +++ src/utils/types.h 2011-06-04 11:07:29.000000000 +0200
- @@ -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;
|
