[meego-commits] 5541: Changes to Trunk:Testing/setup

[Austin Zhang]

Hi,
I have made the following changes to setup in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Austin Zhang

[This message was auto-generated]

---

Request #5541:

  submit:   home:austin:branches:Trunk:Testing/setup(r3)(cleanup) -> Trunk:Testing/setup


Message:
    Added additional flags for relocation and RO PLT

State:   new          2010-07-09T16:36:34 austin
Comment: None



changes files:
--------------
--- setup.changes
+++ setup.changes
@@ -0,0 +1,3 @@
+* Thu Jul 08 2010 Austin Zhang <austin.zhang at linux.intel.com> - 2.8.15
+- Added additional flags for relocation and RO PLT
+

new:
----
  setup-2.8.15-additional-LD-flags.patch

spec files:
-----------
--- setup.spec
+++ setup.spec
@@ -11,6 +11,7 @@
 Patch3: setup-2.8.9-securetty.patch
 Patch4: setup-2.8.15-polkituser.patch
 Patch5: setup-2.8.15-update-options
+Patch6: setup-2.8.15-additional-LD-flags.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -27,6 +28,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 ./shadowconvert.sh
 
 %build

other changes:
--------------

++++++ setup-2.8.15-additional-LD-flags.patch (new)
--- setup-2.8.15-additional-LD-flags.patch
+++ setup-2.8.15-additional-LD-flags.patch
+diff -Naurp setup-2.8.15-orig/profile setup-2.8.15/profile
+--- setup-2.8.15-orig/profile	2010-07-08 08:36:26.000000000 -0400
++++ setup-2.8.15/profile	2010-07-08 09:16:47.000000000 -0400
+@@ -65,11 +65,14 @@ unset i
+ unset pathmunge
+ 
+ if [ `uname -m` == "i686" ]; then
+-    export CFLAGS="-O2 -g -march=core2 -mssse3 -mtune=atom -mfpmath=sse"
+-    export CXXFLAGS="-O2 -g -march=core2 -mssse3 -mtune=atom -mfpmath=sse"
++    export CFLAGS="-O2 -g -march=core2 -mssse3 -mtune=atom -mfpmath=sse -fstack-protector --param=ssp-buffer-size=4 -Wl,-z,relro,-z,now"
++    export CXXFLAGS="-O2 -g -march=core2 -mssse3 -mtune=atom -mfpmath=sse -fstack-protector --param=ssp-buffer-size=4 -Wl,-z,relro,-z,now"
+     export cmov="yes"
+     export fast_cmov="yes"
+     export pthreads="yes"
++else
++    export CFLAGS="-Wl,-z,relro,-z,now"
++    export CXXFLAGS="-Wl,-z,relro,-z,now"
+ fi 
+ #set i18n stuff
+ if [ -f /etc/sysconfig/i18n ]; then