summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/boost.spec7
-rw-r--r--tools/build/src/tools/gcc.jam10
2 files changed, 12 insertions, 5 deletions
diff --git a/packaging/boost.spec b/packaging/boost.spec
index f00e5e1aec..f286510c0b 100644
--- a/packaging/boost.spec
+++ b/packaging/boost.spec
@@ -473,9 +473,7 @@ EOF
# perform the compilation
./b2 %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} \
- --user-config=./user-config.jam ${CFLAGS:+cflags="$CFLAGS"} \
- ${CXXFLAGS:+cxxflags="$CXXFLAGS"} ${LDFLAGS:+linkflags="$LDFLAGS"}
-
+ --user-config=./user-config.jam toolset=gcc debug-symbols=on
%if %build_docs
cd doc
@@ -541,7 +539,7 @@ chmod -x ../%{name}_%{short_version}_pdf/*.pdf
%endif
#rm -f %{buildroot}%{_libdir}/*.a
-ls %{buildroot}%{_libdir}/*.a | grep -v libboost_unit_test_framework.a | xargs rm
+ls %{buildroot}%{_libdir}/*.a | xargs rm
#symlink dupes
# Delete cmake files
@@ -739,7 +737,6 @@ rm -rf %{buildroot}%{_libdir}/cmake
%license LICENSE_1_0.txt
%{_libdir}/libboost_prg_exec_monitor*.so.*
%{_libdir}/libboost_unit_test_framework*.so.*
-%{_libdir}/libboost_unit_test_framework.a
%files -n boost-program-options
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
index b9bb9cf2ad..fe50829ea9 100644
--- a/tools/build/src/tools/gcc.jam
+++ b/tools/build/src/tools/gcc.jam
@@ -759,6 +759,12 @@ toolset.flags gcc.compile INCLUDES <include> ;
toolset.flags gcc.compile.c++ TEMPLATE_DEPTH <c++-template-depth> ;
toolset.flags gcc.compile.fortran USER_OPTIONS <fflags> ;
+# Tizen Opention
+toolset.flags gcc.compile OPTIONS : -O2 ;
+toolset.flags gcc.compile OPTIONS : -Wp,-D_FORTIFY_SOURCE=2 ;
+toolset.flags gcc.compile OPTIONS : -Wl,-z,relro ;
+toolset.flags gcc.compile OPTIONS : -fstack-protector-strong ;
+
###
### Linking generators and actions.
###
@@ -877,6 +883,10 @@ toolset.flags gcc.link FINDLIBS-ST <find-static-library> ;
toolset.flags gcc.link FINDLIBS-SA <find-shared-library> ;
toolset.flags gcc.link LIBRARIES <library-file> ;
+# Tizen Opention
+toolset.flags gcc.link OPTIONS : -Wl,-z,relro ;
+
+
# Specify compile flags for linker as well as they may be needed for LTO
toolset.flags gcc.link OPTIONS <local-visibility>hidden : -fvisibility=hidden -fvisibility-inlines-hidden ;
toolset.flags gcc.link OPTIONS <local-visibility>protected : -fvisibility=protected ;