diff options
| author | lloyd <[email protected]> | 2012-01-25 02:01:17 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-01-25 02:01:17 +0000 |
| commit | 1b12d3afbd32e8e0bd39900dfb9359e2b9a9af99 (patch) | |
| tree | 0c97e21afb55a345f444cc71976321b81cef1b5b | |
| parent | 3d6c45f0f9e66183bd7bcd4751e67e682e956cb0 (diff) | |
Fix lib suffix
| -rw-r--r-- | src/build-data/cc/gcc.txt | 8 | ||||
| -rw-r--r-- | src/build-data/makefile/python.in | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 0852e5be1..3de85099c 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -13,7 +13,7 @@ add_lib_option -l lang_flags "-D_REENTRANT -Wno-long-long" warning_flags "-W -Wall" -maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast" +maintainer_warning_flags "-Werror -Weffc++ -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast" lib_opt_flags "-O3" check_opt_flags "-O2" @@ -49,7 +49,11 @@ i586 -> "-mtune=generic -momit-leaf-frame-pointer" # Translate to GCC-speak nehalem -> "-march=corei7 -momit-leaf-frame-pointer" -westmere -> "-march=corei7 -maes -momit-leaf-frame-pointer" +#westmere -> "-march=corei7 -maes -momit-leaf-frame-pointer" + +#nehalem -> "-march=core2 -msse4.1 -msse4.2 -momit-leaf-frame-pointer" +#westmere -> "-march=core2 -msse4.1 -msse4.2 -maes -momit-leaf-frame-pointer" + sandybridge -> "-march=corei7-avx -momit-leaf-frame-pointer" atom32 -> "-march=atom -momit-leaf-frame-pointer" diff --git a/src/build-data/makefile/python.in b/src/build-data/makefile/python.in index 583c91eb5..74620fe06 100644 --- a/src/build-data/makefile/python.in +++ b/src/build-data/makefile/python.in @@ -3,6 +3,8 @@ CFLAGS = -Os LDFLAGS = WARN_FLAGS = %{warn_flags} +SERIES = %{version_major}.%{version_minor} + PYTHON_ROOT = /usr/lib/python%{python_version}/config PYTHON_INC = -I/usr/include/python%{python_version} PYTHON_SITE_PACKAGE_DIR = /usr/lib/python%{python_version}/site-packages/ @@ -19,7 +21,7 @@ all: $(BOTAN_PYTHON_MODDIR)/_botan.so $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS) cp %{python_dir}/*.py $(BOTAN_PYTHON_MODDIR) - $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan -lboost_python -o $@ + $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -lboost_python -o $@ clean: rm -rf $(BOTAN_PYTHON_MODDIR)/* |