Hello community,

here is the log from the commit of package grub for openSUSE:Factory checked in 
at 2014-01-07 17:19:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub (Old)
 and      /work/SRC/openSUSE:Factory/.grub.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "grub"

Changes:
--------
--- /work/SRC/openSUSE:Factory/grub/grub.changes        2013-11-15 
08:37:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.grub.new/grub.changes   2014-01-07 
17:19:51.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Jan  4 17:24:55 UTC 2014 - [email protected]
+
+- some changes merged from Fedora:
+ - build with -O0 -static instead of -Os
+ - disable net boot, too much trouble for a legacy option
+ - compile with recent gcc but with more -f options 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ grub.spec ++++++
--- /var/tmp/diff_new_pack.7BRRCb/_old  2014-01-07 17:19:52.000000000 +0100
+++ /var/tmp/diff_new_pack.7BRRCb/_new  2014-01-07 17:19:52.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,14 @@
 Name:           grub
 BuildRequires:  automake
 %ifarch x86_64
-BuildRequires:  gcc41-32bit
+BuildRequires:  gcc-32bit
 BuildRequires:  glibc-devel-32bit
+BuildRequires:  glibc-devel-static-32bit
 BuildRequires:  libncurses5-32bit
 BuildRequires:  ncurses-devel-32bit
 %else
-BuildRequires:  gcc41
 BuildRequires:  glibc-devel
+BuildRequires:  glibc-devel-static
 BuildRequires:  libncurses5
 BuildRequires:  ncurses-devel
 %endif
@@ -139,25 +140,10 @@
 %build
 perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi
 %{?suse_update_config:%{suse_update_config -l -f . }}
-export CC="gcc-4.1"
 autoreconf --force --install
-%ifarch x86_64
-  EXTRACFLAGS=' -fno-stack-protector -fno-strict-aliasing 
-minline-all-stringops -m32 -fno-asynchronous-unwind-tables -fno-unwind-tables'
-%else
-  EXTRACFLAGS=' -fno-stack-protector -fno-strict-aliasing 
-minline-all-stringops -fno-asynchronous-unwind-tables -fno-unwind-tables'
-%endif  
-# RPM_OPT_FLAGS considered harmful on 64-bit :-(
-CFLAGS="-m32 -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \
-  --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} --datadir=/usr/lib \
-  --disable-auto-linux-mem-opt --enable-diskless \
-  
--enable-{3c50{3,7},3c5{0,2}9,3c595,3c90x,cs89x0,davicom,depca,eepro{,100},epic100}
 \
-  --enable-{exos205,lance,ne,ne2100,ni{50,52,65}00,ns8390} \
-  --enable-{rtl8139,sk-g16,smc9000,tiara,tulip,via-rhine,w89c840,wd} 
-make
-(cd stage2; mv nbgrub pxegrub ..)
-mv stage2/stage2{,.netboot}
-make clean
-CFLAGS="-m32 -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \
+EXTRACFLAGS=' -fno-reorder-functions -fno-stack-protector -fno-strict-aliasing 
-minline-all-stringops -fno-asynchronous-unwind-tables -fno-unwind-tables 
-static'
+# RPM_OPT_FLAGS considered harmful
+CFLAGS="-m32 -O0 -g -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" 
./configure \
   --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} --datadir=/usr/lib \
   --disable-auto-linux-mem-opt --disable-ffs --disable-ufs2
 make
@@ -167,7 +153,6 @@
 mkdir -p $RPM_BUILD_ROOT/boot/grub
 ln -sfn . $RPM_BUILD_ROOT/boot/boot
 (cd $RPM_BUILD_ROOT/usr/lib/grub && mv *-suse/* . && rmdir *-suse) >/dev/null 
2>&1 || true
-cp -p {nb,pxe}grub stage2/stage2{,.netboot} $RPM_BUILD_ROOT/usr/lib/grub
 mv $RPM_BUILD_ROOT/usr/sbin/grub-install{,.unsupported}
 mv $RPM_BUILD_ROOT/%{_mandir}/man8/grub-install{,.unsupported}.8
 install -p -m 755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/sbin/.

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to