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

[Anas Nashif]

why not just remove the whole thing instead of ifdefing it?

You submission also adds a patch which does exactly what you are trying to remove?


On 2010-08-31, at 2:38 PM, Jan-Simon Möller wrote:

> Hi,
> I have made the following changes to setup in project Trunk:Testing. Please review and accept ASAP.
> 
> Thank You,
> Jan-Simon Möller
> 
> [This message was auto-generated]
> 
> ---
> 
> Request #7204:
> 
>  submit:   devel:base/setup(r21) -> Trunk:Testing/setup
> 
> 
> Message:
>    Remove stale project.diff (forwarded request 7203 from jsmoeller)
> 
> State:   new          2010-08-31T06:38:02 jsmoeller
> Comment: None
> 
> 
> 
> changes files:
> --------------
> --- setup.changes
> +++ setup.changes
> @@ -0,0 +1,9 @@
> +* Wed Aug 18 2010 Jan-Simon Moeller <jsmoeller at linuxfoundation.org> - 2.8.15
> +- Don't include cflags in this way into the build environment. Never ever!
> +- Preparing split of this into a file included in /etc/profile.d/ only on target
> +  and keep it in sync with prjconf. prjconf is master!
> +- Better pull from prjconf and embed !
> +
> +* Wed Aug 18 2010 Austin Zhang <austin.zhang at linux.intel.com> - 2.8.15
> +- Don't omit frame pointer in building.
> +
> 
> new:
> ----
>  setup-2.8.15-no-omit-fp.patch
> 
> spec files:
> -----------
> --- setup.spec
> +++ setup.spec
> @@ -12,6 +12,7 @@
> Patch4: setup-2.8.15-polkituser.patch
> Patch5: setup-2.8.15-update-options
> Patch6: setup-2.8.15-additional-LD-flags.patch
> +Patch7: setup-2.8.15-no-omit-fp.patch
> Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch: noarch
> BuildRequires: bash tcsh perl
> @@ -23,12 +24,20 @@
> 
> %prep
> %setup -q
> -%patch0 -p1
> %patch2 -p1
> %patch3 -p1
> %patch4 -p1
> +
> +%if 0
> +# DON'T INCLUDE THIS IN THE BUILD ENVIRONMENT - NEVER EVER !
> +# Preparing split of this into a file included in /etc/profile.d/ only on target
> +# and keep it in sync with prjconf. prjconf is master !!
> +# Better pull from prjconf and embed !
> +%patch0 -p1
> %patch5 -p1
> %patch6 -p1
> +%patch7 -p1
> +%endif
> ./shadowconvert.sh
> 
> %build
> 
> other changes:
> --------------
> 
> ++++++ setup-2.8.15-no-omit-fp.patch (new)
> --- setup-2.8.15-no-omit-fp.patch
> +++ setup-2.8.15-no-omit-fp.patch
> +diff -Naurp setup-2.8.15-orig/profile setup-2.8.15/profile
> +--- setup-2.8.15-orig/profile	2010-08-18 11:05:33.534636474 +0800
> ++++ setup-2.8.15/profile	2010-08-18 11:20:49.995674116 +0800
> +@@ -65,8 +65,8 @@ unset i
> + unset pathmunge
> + 
> + if [ `uname -m` == "i686" ]; then
> +-    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 CFLAGS="-O2 -g -march=core2 -mssse3 -mtune=atom -mfpmath=sse -fstack-protector --param=ssp-buffer-size=4 -fno-omit-frame-pointer -Wl,-z,relro,-z,now"
> ++    export CXXFLAGS="-O2 -g -march=core2 -mssse3 -mtune=atom -mfpmath=sse -fstack-protector --param=ssp-buffer-size=4 -fno-omit-frame-pointer -Wl,-z,relro,-z,now"
> +     export cmov="yes"
> +     export fast_cmov="yes"
> +     export pthreads="yes"
> 
> _______________________________________________
> Meego-commits mailing list
> Meego-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits