diff --git a/allegro-4.2.2-gcc43-asm.patch b/allegro-4.2.2-gcc43-asm.patch new file mode 100644 index 0000000..86d3744 --- /dev/null +++ b/allegro-4.2.2-gcc43-asm.patch @@ -0,0 +1,12 @@ +diff -up allegro-4.2.2/src/i386/icpus.s~ allegro-4.2.2/src/i386/icpus.s +--- allegro-4.2.2/src/i386/icpus.s~ 2008-03-20 15:11:46.000000000 +0100 ++++ allegro-4.2.2/src/i386/icpus.s 2008-03-20 15:11:46.000000000 +0100 +@@ -67,7 +67,7 @@ FUNC(_i_is_fpu) + + fninit + movl $0x5A5A, %eax +- fnstsw %eax ++ fnstsw %ax + cmpl $0, %eax + jne is_fpu_not_found + diff --git a/allegro.spec b/allegro.spec index 0d0a623..5cc990a 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -20,6 +20,7 @@ Patch5: allegro-4.2.1-noexecmod.patch Patch6: allegro-4.0.3-libdir.patch Patch7: allegro-4.2.2-pulseaudio.patch Patch8: allegro-4.2.2-gcc43.patch +Patch9: allegro-4.2.2-gcc43-asm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel, texinfo, perl, arts-devel, glib2-devel BuildRequires: xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel @@ -163,6 +164,7 @@ sound through JACK (Jack Audio Connection Kit). %patch6 -p1 -z .multilib2 %patch7 -p1 -z .pulse %patch8 -p1 -z .gcc43 +%patch9 -p1 -z .gcc43-asm iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp mv docs/src/allegro._tx.tmp docs/src/allegro._tx @@ -174,12 +176,12 @@ mv docs/src/allegro._tx.tmp docs/src/allegro._tx %endif --enable-svgalib=no \ --enable-dbglib=yes \ - --enable-proflib=yes -%ifnarch %{ix86} -make CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc" -%else -make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc" -%endif + --enable-proflib=yes \ + --enable-opts=generic +# GRRR configure insists on adding -fomit-frame-pointer, remove it +sed -i 's/-fomit-frame-pointer//g' makefile +# Explicitly set PROG_LDFLAGS to avoid stripping of the utilities +make CFLAGS="$RPM_OPT_FLAGS" PROG_LDFLAGS="-Wl,--export-dynamic" %install @@ -291,6 +293,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 1 2008 Hans de Goede 4.2.2-9 +- Fix i386 asm code compilation with latest binutils +- Remove -fomit-frame-pointer from the compile flags of the default build, so + that we get a usefull debuginfo even for the normal (non debug/profile) lib + * Tue Feb 19 2008 Fedora Release Engineering - 4.2.2-8 - Autorebuild for GCC 4.3