Hello community,
here is the log from the commit of package lilo for openSUSE:Factory
checked in at Wed Jun 29 14:18:10 CEST 2011.
--------
--- lilo/lilo.changes 2011-03-04 21:00:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2011-06-28
12:00:09.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 22 16:58:31 CEST 2011 - meiss...@suse.de
+
+- also add the libgcc.a linking in the make*.sh lilo scripts
+- build against 4.6 gcc, also require it during install
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
lilo-libgcc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.UPMj5u/_old 2011-06-29 14:16:28.000000000 +0200
+++ /var/tmp/diff_new_pack.UPMj5u/_new 2011-06-29 14:16:28.000000000 +0200
@@ -36,6 +36,10 @@
Requires: gawk
Requires: sed
Requires: coreutils
+# for relinking the prep/chrp images in lilo
+%ifarch ppc ppc64
+Requires: gcc = 4.6
+%endif
# for nvram
%if 0%{?suse_version} > 1000
Requires: powerpc-utils >= 1.2.6
@@ -63,7 +67,7 @@
%endif
# note: already outdated; download fresh sources from:
https://alioth.debian.org/frs/?group_id=100507
Version: 22.8
-Release: 57
+Release: 58
Source0: lilo-ppc-%{version}.tar.bz2
Source1:
http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
Source86: lilo-%{version}.src.tar.bz2
@@ -74,6 +78,7 @@
Patch8605: lilo-no-build-date.patch
Patch8606: lilo.ppc.nvram-fix.patch
Patch8607: yaboot-libgcc.patch
+Patch8608: lilo-libgcc.patch
# $Id: lilo.spec 1188 2008-12-09 14:29:53Z olh $
%description
@@ -98,9 +103,12 @@
%patch8605
popd
%patch8606
-cd yaboot
+pushd yaboot
%patch8607 -p1
-cd ..
+popd
+pushd lilo.ppc
+%patch8608 -p1
+popd
%build
%ifarch %ix86 x86_64
++++++ lilo-libgcc.patch ++++++
--- lilo.ppc/bootheader/scripts/make_zimage_chrp.sh.xx 2011-06-22
16:33:00.000000000 +0200
+++ lilo.ppc/bootheader/scripts/make_zimage_chrp.sh 2011-06-22
16:48:54.000000000 +0200
@@ -138,7 +138,8 @@
$obj_dir/chrp/chrp.a \
$obj_dir/common/common.a \
$obj_dir/chrp/prom.a \
- $obj_dir/common/zlib.a
+ $obj_dir/common/zlib.a \
+ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
#
if [ "$no_addnote" = "false" ] ; then
case "$HOSTTYPE" in
--- lilo.ppc/bootheader/scripts/make_zimage_pmac_newworld.sh.xx 2011-06-22
16:33:00.000000000 +0200
+++ lilo.ppc/bootheader/scripts/make_zimage_pmac_newworld.sh 2011-06-22
16:49:11.000000000 +0200
@@ -119,7 +119,8 @@
$obj_dir/chrp/chrp.a \
$obj_dir/common/common.a \
$obj_dir/chrp/prom.a \
- $obj_dir/common/zlib.a
+ $obj_dir/common/zlib.a \
+ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
rm -f "$output"
cp "$tmp/output" "$output"
--- lilo.ppc/bootheader/scripts/make_zimage_pmac_oldworld_coff.sh.xx
2011-06-22 16:33:00.000000000 +0200
+++ lilo.ppc/bootheader/scripts/make_zimage_pmac_oldworld_coff.sh
2011-06-22 16:49:18.000000000 +0200
@@ -120,7 +120,8 @@
$obj_dir/chrp/chrp.a \
$obj_dir/common/common.a \
$obj_dir/chrp/prom.a \
- $obj_dir/common/zlib.a
+ $obj_dir/common/zlib.a \
+ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
#
objcopy \
-O aixcoff-rs6000 \
--- lilo.ppc/bootheader/scripts/make_zimage_prep.sh.xx 2011-06-22
16:33:00.000000000 +0200
+++ lilo.ppc/bootheader/scripts/make_zimage_prep.sh 2011-06-22
16:49:25.000000000 +0200
@@ -116,7 +116,8 @@
$obj_dir/prep/prep.a \
$obj_dir/common/common.a \
$obj_dir/chrp/prom.a \
- $obj_dir/common/zlib.a
+ $obj_dir/common/zlib.a \
+ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
objcopy \
-O elf32-powerpc \
--- lilo.ppc/bootheader/scripts/make_zimage_ps3.sh.xx 2011-06-22
16:33:00.000000000 +0200
+++ lilo.ppc/bootheader/scripts/make_zimage_ps3.sh 2011-06-22
16:49:32.000000000 +0200
@@ -124,6 +124,7 @@
$tmp/ps3-head.o \
$tmp/empty.o \
$obj_dir/ps3/ps3.a \
+ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
# convert to RAW format
objcopy -O binary --set-section-flags=.bss=contents,alloc,load,data
$tmp/zImage.ps3 $tmp/zImage.ps3.bin
++++++ yaboot-libgcc.patch ++++++
--- /var/tmp/diff_new_pack.UPMj5u/_old 2011-06-29 14:16:28.000000000 +0200
+++ /var/tmp/diff_new_pack.UPMj5u/_new 2011-06-29 14:16:28.000000000 +0200
@@ -5,7 +5,19 @@
second/yaboot: $(OBJS) util/addnote ld.script second/yaboot.a second/empty.o
- $(LD) -T ld.script $(LFLAGS) second/empty.o second/crt0.o
second/yaboot.a -o $@
-+ $(LD) -T ld.script $(LFLAGS) second/empty.o second/crt0.o
second/yaboot.a -o $@ /usr/lib/gcc/powerpc64-suse-linux/4.5/libgcc.a
++ $(LD) -T ld.script $(LFLAGS) second/empty.o second/crt0.o
second/yaboot.a -o $@ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
chmod -x $@
cp $@ $@.chrp
util/addnote $@.chrp
+--- yaboot-22.8-r1190/make_yaboot.sh.xx 2011-06-22 16:23:03.000000000
+0200
++++ yaboot-22.8-r1190/make_yaboot.sh 2011-06-22 16:23:26.000000000 +0200
+@@ -80,7 +80,8 @@
+ -o $tmp/output \
+ $obj_dir/chrp/yaboot.crt0.o \
+ $tmp/empty.o \
+- $obj_dir/chrp/yaboot.a
++ $obj_dir/chrp/yaboot.a \
++ /usr/lib/gcc/powerpc64-suse-linux/4.6/libgcc.a
+ #
+ if [ "$do_addnote" = "true" ] ; then
+ echo add note section for RS6K
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
