rpms/allegro/devel allegro-4.2.2-gcc43-asm.patch, NONE, 1.1 allegro.spec, 1.49, 1.50

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Tue Apr 1 09:50:12 UTC 2008


Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3721

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.2.2-gcc43-asm.patch 
Log Message:
* Tue Apr  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 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


allegro-4.2.2-gcc43-asm.patch:

--- NEW FILE allegro-4.2.2-gcc43-asm.patch ---
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
 


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- allegro.spec	19 Feb 2008 06:42:36 -0000	1.49
+++ allegro.spec	1 Apr 2008 09:49:30 -0000	1.50
@@ -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 @@
 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 @@
 %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 @@
 %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 @@
 
 
 %changelog
+* Tue Apr  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 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 <rel-eng at fedoraproject.org> - 4.2.2-8
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list