aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2011-04-22 11:50:54 +0000
committerlloyd <[email protected]>2011-04-22 11:50:54 +0000
commit2217a99880ba7d93950b3c24e5ed8f61fbf9cf62 (patch)
treee5844aa2369514a9f4728d66e7a51ec1ce79b151
parent0771ef306eedd46aaa17005044e46ea0c9ac01a4 (diff)
Intel C++ doesn't seem to have an option for setting the soname, so it
will default to the full output file name. That actually worked as expected when the so was always written as libbotan-1.8.2, but doesn't anymore since soname does not match the written file. This probably won't work right on Windows, but I don't have access to Intel C++ on Windows. Note good Intel C++ 11.1 build in build log Note that CPython 2.7 works for configuring the build
-rwxr-xr-xconfigure.py2
-rw-r--r--doc/build_log.txt1
-rw-r--r--src/build-data/cc/icc.txt2
3 files changed, 3 insertions, 2 deletions
diff --git a/configure.py b/configure.py
index ef2342e0f..2e68bd12c 100755
--- a/configure.py
+++ b/configure.py
@@ -6,7 +6,7 @@ Configuration program for botan (http://botan.randombit.net/)
Distributed under the terms of the Botan license
Tested with
- CPython 2.5, 2.6 - OK
+ CPython 2.5, 2.6, 2.7 - OK
Jython 2.5 - Target detection does not work (use --os and --cpu)
CPython 2.4 and earlier are not supported
diff --git a/doc/build_log.txt b/doc/build_log.txt
index 21035090a..968c9e912 100644
--- a/doc/build_log.txt
+++ b/doc/build_log.txt
@@ -15,6 +15,7 @@ Debian reports the build results for 1.8 on `a number of platforms
=========== ======= =================== ======================== ============================ ========
Date Version OS CPU Compiler Results
=========== ======= =================== ======================== ============================ ========
+2011-04-22 1.9.16 Gentoo 10.0 Intel Core i7-860 Intel C++ 11.1 OK
2011-04-15 1.9.16 Haiku R1-alpha2 x86 GCC 4.3.3 OK
2011-04-15 1.9.16 Haiku R1-alpha2 x86 GCC 2.95.3 Can't compile
2011-04-15 1.9.16 Windows 7 x86-64 Visual C++ 16.00.30319.01 OK
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index e8d14c581..28c1a2816 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -32,5 +32,5 @@ westmere -> "-march=core2"
</mach_opt>
<so_link_flags>
-default -> "$(CXX) -fPIC -shared"
+default -> "$(CXX) -fPIC -shared -Wl,-soname,$(SONAME)"
</so_link_flags>