[gst-devel] rpm build problems

Arnd Bergmann std7652 at et.FH-Osnabrueck.DE
Mon Jun 4 15:23:49 CEST 2001 

On Sun, 3 Jun 2001, Richard Boulton wrote:

> This should now work.
> Please report if they continue to fail.

OK, the RPM build works fine now, but the compiler optimization
flags are still mostly nonsense. I have made two patches that
correct this. 

The first simply appends $RPM_OPT_FLAGS or -march=$target_cpu
to $CFLAGS and should cause no problems but a noticable speed up. 
Note that 'CFLAGS=$RPM_OPT_FLAGS ./configure' did not work because 
$CFLAGS is cleaned at the beginning of configure (is this a bug 
or a feature?)!

The other patch is an attempt to correct the CFLAGS in
the Makefile.am's. Many of them are obviously wrong in the
current tree, which can be seen from a number of mistakes:
- many files that should be optimized better than average
  (e.g. mpeg*) use lower optimizations than the rest, e.g.
  -O2 instead of -O6 and -m486 instead of -march=i686.
- -m486 is deprecated
- -O3 -finline-functions -fschedule-insns2 is bogus, because
  -O3 already includes the others.
- sometimes, -march=i686 is used without checking for
  the architecture!
To clean the current mess with the CFLAGS up, something like
my patch has to be applied. OTOH, I have not tested it 
all of it (I don't even have test cases for most of the 
plugins) and in one place or the other, the current flags 
may actually have a reason to be there, so maybe this
should not go into 0.2.0, if someone thinks it may do 
harm.

Arnd <><
-------------- next part --------------
Index: configure.base
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/configure.base,v
retrieving revision 1.16
diff -u -r1.16 configure.base
--- configure.base	2001/06/02 23:36:42	1.16
+++ configure.base	2001/06/04 13:05:21
@@ -866,10 +879,9 @@
 fi
 
 if test "x$USE_PROFILING" = xyes; then
-  CFLAGS="$CFLAGS -pg"
-  FOMIT_FRAME_POINTER=""
+  CFLAGS="$CFLAGS -pg -fno-omit-frame-pointer"
 else
-  FOMIT_FRAME_POINTER="-fomit-frame-pointer"
+  CFLAGS="$CFLAGS -fomit-frame-pointer"
 fi
 
 if test "x$HAVE_LIBXV" = xyes; then
Index: gst/elements/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- gst/elements/Makefile.am	2001/05/26 12:17:05	1.24
+++ gst/elements/Makefile.am	2001/06/04 13:05:21
@@ -38,7 +38,5 @@
 	gsttee.h		\
 	gstsinesrc.h
 
-CFLAGS += -O2 -Wall
-
 libgstelements_la_LIBADD = $(GHTTP_LIBS)
 libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
Index: libs/colorspace/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/libs/colorspace/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- libs/colorspace/Makefile.am	2001/01/14 21:55:38	1.6
+++ libs/colorspace/Makefile.am	2001/06/04 13:05:21
@@ -15,5 +15,4 @@
 
 noinst_HEADERS = yuv2rgb.h
 
-# FIXME is this needed?
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
+CFLAGS += -ffast-math
Index: libs/getbits/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/libs/getbits/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- libs/getbits/Makefile.am	2001/05/28 19:09:48	1.11
+++ libs/getbits/Makefile.am	2001/06/04 13:05:21
@@ -21,4 +21,4 @@
 gbtest_SOURCES = gbtest.c
 gbtest_LDADD = libgstgetbits.la $(GST_LIBS)
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: libs/idct/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/libs/idct/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- libs/idct/Makefile.am	2001/05/28 19:09:48	1.7
+++ libs/idct/Makefile.am	2001/06/04 13:05:21
@@ -27,4 +27,4 @@
 
 noinst_HEADERS = dct.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
+CFLAGS += -ffast-math
Index: libs/putbits/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/libs/putbits/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- libs/putbits/Makefile.am	2001/01/14 21:55:38	1.3
+++ libs/putbits/Makefile.am	2001/06/04 13:05:21
@@ -9,4 +9,4 @@
 
 noinst_HEADERS = gstputbits.h 
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: libs/riff/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/libs/riff/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- libs/riff/Makefile.am	2001/01/14 21:55:38	1.5
+++ libs/riff/Makefile.am	2001/06/04 13:05:21
@@ -7,4 +7,4 @@
 libgstriffincludedir = $(includedir)/gst/libs/gstriff
 libgstriffinclude_HEADERS = gstriff.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: libs/videoscale/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/libs/videoscale/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- libs/videoscale/Makefile.am	2001/02/24 00:23:21	1.8
+++ libs/videoscale/Makefile.am	2001/06/04 13:05:21
@@ -16,4 +16,5 @@
 noinst_HEADERS = gstscale_x86.h
 
 #CFLAGS += -S -O1 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+# FIXME: why this?
-CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GST_CFLAGS) $(XML_CFLAGS) -O5 -fomit-frame-pointer -ffast-math
+CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GST_CFLAGS) $(XML_CFLAGS) -ffast-math
Index: plugins/aasink/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/aasink/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- plugins/aasink/Makefile.am	2001/05/27 21:56:03	1.2
+++ plugins/aasink/Makefile.am	2001/06/04 13:05:21
@@ -8,6 +8,6 @@
 
 noinst_HEADERS = aasink.h
 
-CFLAGS += -O3 -ffast-math -finline-functions
+CFLAGS += -ffast-math
 
 libaasink_la_LIBADD = $(GLIB_LIBS) $(GSTAALIBS)
Index: plugins/avi/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/avi/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- plugins/avi/Makefile.am	2001/06/02 18:08:45	1.20
+++ plugins/avi/Makefile.am	2001/06/04 13:05:21
@@ -11,8 +11,6 @@
 
 filter_LTLIBRARIES = libaviencoder.la libavidecoder.la libavidemux.la libavitypes.la
 
-CFLAGS += -O2
-
 libavidemux_la_SOURCES = gstavidemux.c 
 libavitypes_la_SOURCES = gstavitypes.c 
 libavidecoder_la_SOURCES = gstavidecoder.c 
@@ -26,4 +24,4 @@
 codectest_LDFLAGS = $(GST_LIBS) $(GNOME_LIBS) $(top_builddir)/libs/winloader/libwinloader.la
 codectest_SOURCES = codectest.c
 
-CFLAGS += -O2 -ffast-math 
+CFLAGS += -ffast-math 
Index: plugins/avi/winaudio/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/avi/winaudio/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- plugins/avi/winaudio/Makefile.am	2001/06/02 18:08:45	1.1
+++ plugins/avi/winaudio/Makefile.am	2001/06/04 13:05:21
@@ -4,7 +4,4 @@
 
 libaviaudiodecoder_la_SOURCES = aviaudiodecoder.c 
 
-#CFLAGS += -Wall -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
-CFLAGS += -O2
-
 noinst_HEADERS = aviaudiodecoder.h
Index: plugins/avi/wincodec/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/avi/wincodec/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- plugins/avi/wincodec/Makefile.am	2001/04/02 14:21:07	1.5
+++ plugins/avi/wincodec/Makefile.am	2001/06/04 13:05:21
@@ -4,7 +4,4 @@
 
 libwincodec_la_SOURCES = gstwincodec.c gstwindec.c gstwinenc.c
 
-#CFLAGS += -Wall -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
-CFLAGS += -O2
-
 noinst_HEADERS = gstwindec.h gstwinenc.h
Index: plugins/capture/v4l/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/capture/v4l/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- plugins/capture/v4l/Makefile.am	2001/01/14 21:55:39	1.5
+++ plugins/capture/v4l/Makefile.am	2001/06/04 13:05:21
@@ -6,6 +6,4 @@
                    gstv4lsrc.c \
                    grab-v4l.c
 
-CFLAGS += -O2
-
 noinst_HEADERS = gstv4lsrc.h grab.h
Index: plugins/filters/median/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/filters/median/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/filters/median/Makefile.am	2001/01/14 21:55:39	1.3
+++ plugins/filters/median/Makefile.am	2001/06/04 13:05:21
@@ -4,6 +4,6 @@
 
 libmedian_la_SOURCES = median.c
 
-CFLAGS += -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math 
+CFLAGS += -funroll-all-loops -ffast-math 
 
 noinst_HEADERS = median.h
Index: plugins/filters/smooth/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/filters/smooth/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/filters/smooth/Makefile.am	2001/01/14 21:55:39	1.3
+++ plugins/filters/smooth/Makefile.am	2001/06/04 13:05:21
@@ -4,6 +4,6 @@
 
 libsmooth_la_SOURCES = smooth.c
 
-CFLAGS += -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math 
+CFLAGS += -funroll-all-loops -ffast-math 
 
 noinst_HEADERS = smooth.h
Index: plugins/jpeg/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/jpeg/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- plugins/jpeg/Makefile.am	2001/05/16 20:41:14	1.7
+++ plugins/jpeg/Makefile.am	2001/06/04 13:05:21
@@ -5,6 +5,6 @@
 libgstjpeg_la_SOURCES = gstjpeg.c gstjpegdec.c gstjpegenc.c
 libgstjpeg_la_LIBADD = -ljpeg
 
-CFLAGS += -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
+CFLAGS += -funroll-all-loops -ffast-math -DNDEBUG
 
 noinst_HEADERS = gstjpegdec.h gstjpegenc.h
Index: plugins/mp3decode/mpg123/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mp3decode/mpg123/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- plugins/mp3decode/mpg123/Makefile.am	2001/04/22 23:18:17	1.16
+++ plugins/mp3decode/mpg123/Makefile.am	2001/06/04 13:05:21
@@ -31,14 +31,10 @@
         dct64.c
 
 if HAVE_CPU_I386
-ARCHCFLAGS = -O2 -mcpu=i486
 ARCHDECODESRC = $(ARCHI386SRC)
 else
-ARCHCFLAGS = -O2
 ARCHDECODESRC = $(ARCHOTHERSRC)
 endif
-
-CFLAGS += $(ARCHCFLAGS)
 
 filterdir = $(libdir)/gst
 
Index: plugins/mp3decode/parse/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mp3decode/parse/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- plugins/mp3decode/parse/Makefile.am	2001/01/14 21:55:39	1.4
+++ plugins/mp3decode/parse/Makefile.am	2001/06/04 13:05:21
@@ -7,6 +7,6 @@
 noinst_HEADERS = mp3parse.h
 
 # FIXME is this useful?
-CFLAGS += -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions 
+CFLAGS += -ffast-math
 
 EXTRA_DIST = README
Index: plugins/mp3decode/types/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mp3decode/types/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- plugins/mp3decode/types/Makefile.am	2001/01/14 21:55:39	1.2
+++ plugins/mp3decode/types/Makefile.am	2001/06/04 13:05:21
@@ -4,5 +4,4 @@
 
 libmp3types_la_SOURCES = mp3types.c
 
-# FIXME is this needed?
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: plugins/mpeg1/mpeg1encoder/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg1/mpeg1encoder/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/mpeg1/mpeg1encoder/Makefile.am	2001/01/14 21:55:40	1.3
+++ plugins/mpeg1/mpeg1encoder/Makefile.am	2001/06/04 13:05:22
@@ -16,14 +16,6 @@
                           transform.c \
                           gstmpeg1encoder.c
 
-if HAVE_CPU_I386
-ARCHCFLAGS = -O3 -m486 -fschedule-insns2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
-else
-ARCHCFLAGS = -O3 -fschedule-insns2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
-endif
-
-CFLAGS += $(ARCHCFLAGS)
-
 noinst_HEADERS = csize.h \
                  ctables.h \
                  dct.h \
Index: plugins/mpeg1/mpeg_play/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg1/mpeg_play/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- plugins/mpeg1/mpeg_play/Makefile.am	2001/02/27 19:44:49	1.20
+++ plugins/mpeg1/mpeg_play/Makefile.am	2001/06/04 13:05:22
@@ -3,15 +3,13 @@
 filter_LTLIBRARIES = libmpeg_play.la
 
 if HAVE_CPU_I386
-ARCHCFLAGS = -O3 -m486 -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math -DNDEBUG
 ARCHSRCS   = recon_mmx.c    \
              recon_mmxe.s
 else
-ARCHCFLAGS = -O3 -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math -DNDEBUG
 ARCHSRCS   =
 endif
 
-CFLAGS += $(ARCHCFLAGS)
+CFLAGS += -ffast-math -DNDEBUG
 
 libmpeg_play_la_SOURCES = $(ARCHSRCS)    \
 			  decoders.c     \
Index: plugins/mpeg1/mpegaudio/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg1/mpegaudio/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- plugins/mpeg1/mpegaudio/Makefile.am	2001/01/14 21:55:40	1.7
+++ plugins/mpeg1/mpegaudio/Makefile.am	2001/06/04 13:05:22
@@ -12,13 +12,7 @@
 	tables.c            \
 	tonal.c
 
-if HAVE_CPU_I386
-ARCHCFLAGS = -O2 -m486 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
-else
-ARCHCFLAGS = -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
-endif
-
-CFLAGS += $(ARCHCFLAGS)
+CFLAGS += -ffast-math
 
 noinst_HEADERS = gstmpegaudio.h common.h  encoder.h musicin.h table_alloc.h \
                  table_enwindow.h table_absthr.h table_cb.h table_th.h
Index: plugins/mpeg1/parse/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg1/parse/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- plugins/mpeg1/parse/Makefile.am	2001/01/14 21:55:40	1.7
+++ plugins/mpeg1/parse/Makefile.am	2001/06/04 13:05:22
@@ -6,6 +6,6 @@
 
 noinst_HEADERS = mpeg1parse.h 
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
 
 EXTRA_DIST = README notes
Index: plugins/mpeg1/system_encode/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg1/system_encode/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/mpeg1/system_encode/Makefile.am	2001/01/14 21:55:40	1.3
+++ plugins/mpeg1/system_encode/Makefile.am	2001/06/04 13:05:22
@@ -10,4 +10,4 @@
 		 main.h \
 		 buffer.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: plugins/mpeg1video/parse/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg1video/parse/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- plugins/mpeg1video/parse/Makefile.am	2001/01/14 21:55:40	1.5
+++ plugins/mpeg1video/parse/Makefile.am	2001/06/04 13:05:22
@@ -6,6 +6,6 @@
 
 noinst_HEADERS = mp1videoparse.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
 
 EXTRA_DIST = README
Index: plugins/mpeg2/ac3dec/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/ac3dec/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- plugins/mpeg2/ac3dec/Makefile.am	2001/01/14 21:55:40	1.8
+++ plugins/mpeg2/ac3dec/Makefile.am	2001/06/04 13:05:22
@@ -17,13 +17,7 @@
 	downmix_kni.h \
 	audio_out.h bswap.h cmplx.h
 
-if HAVE_CPU_I386
-ARCHCFLAGS = -m486
-else
-ARCHCFLAGS =
-endif
-
-CFLAGS += -O3 $(ARCHCFLAGS) $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
 
 EXTRA_DIST = README
 
Index: plugins/mpeg2/ac3parse/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/ac3parse/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- plugins/mpeg2/ac3parse/Makefile.am	2001/01/14 21:55:40	1.5
+++ plugins/mpeg2/ac3parse/Makefile.am	2001/06/04 13:05:22
@@ -6,6 +6,6 @@
 
 noinst_HEADERS = ac3parse.h
 
-CFLAGS += -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
 
 EXTRA_DIST = README
Index: plugins/mpeg2/mpeg2dec/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/mpeg2dec/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- plugins/mpeg2/mpeg2dec/Makefile.am	2001/03/04 22:22:37	1.10
+++ plugins/mpeg2/mpeg2dec/Makefile.am	2001/06/04 13:05:22
@@ -13,13 +13,7 @@
 #perftest_CFLAGS = $(GST_CFLAGS)
 #perftest_LDADD = $(GST_LIBS)
 
-if HAVE_CPU_I386
-ARCHFLAGS = -m486
-else
-ARCHFLAGS = 
-endif
-
-CFLAGS += -O3 $(ARCHFLAGS) $(FOMIT_FRAME_POINTER) -ffast-math
+CFLAGS += -O3 -ffast-math
 #CFLAGS += -pg -Wall -fprofile-arcs -ftest-coverage
 #CFLAGS += -pg -Wall -O3
 
Index: plugins/mpeg2/mpeg2enc/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/mpeg2enc/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- plugins/mpeg2/mpeg2enc/Makefile.am	2001/01/14 21:55:40	1.13
+++ plugins/mpeg2/mpeg2enc/Makefile.am	2001/06/04 13:05:22
@@ -45,13 +45,7 @@
                           gstmpeg2enc.c \
 			  $(ASM_SRCS)
 
-if HAVE_CPU_I386
-ARCHCFLAGS = -m486
-else
-ARCHCFLAGS = 
-endif
-
-CFLAGS += -O3 $(ARCHCFLAGS) -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
+CFLAGS += -ffast-math
 
 noinst_HEADERS = mpeg2enc.h \
 		 gstmpeg2enc.h \
Index: plugins/mpeg2/mpegtypes/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/mpegtypes/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/mpeg2/mpegtypes/Makefile.am	2001/01/14 21:55:40	1.3
+++ plugins/mpeg2/mpegtypes/Makefile.am	2001/06/04 13:05:22
@@ -4,4 +4,4 @@
 
 libmpeg2types_la_SOURCES = mpeg2types.c
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: plugins/mpeg2/parse/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/parse/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- plugins/mpeg2/parse/Makefile.am	2001/01/14 21:55:40	1.6
+++ plugins/mpeg2/parse/Makefile.am	2001/06/04 13:05:22
@@ -6,6 +6,6 @@
 
 noinst_HEADERS = mpeg2parse.h
 
-CFLAGS + = -O3 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
+CFLAGS += -ffast-math
 
 EXTRA_DIST = README notes
Index: plugins/mpeg2/subtitles/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/subtitles/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/mpeg2/subtitles/Makefile.am	2001/01/14 21:55:40	1.3
+++ plugins/mpeg2/subtitles/Makefile.am	2001/06/04 13:05:22
@@ -4,13 +4,7 @@
 
 libmpeg2subt_la_SOURCES = mpeg2subt.c  
 
-if HAVE_CPU_I386
-ARCHCFLAGS = -m486
-else
-ARCHCFLAGS = 
-endif
-
-CFLAGS += -O3 $(ARCHCFLAGS) -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math 
+CFLAGS += -ffast-math 
 
 noinst_HEADERS = mpeg2subt.h 
 
Index: plugins/mpeg2/video/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/video/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- plugins/mpeg2/video/Makefile.am	2001/02/27 19:44:49	1.10
+++ plugins/mpeg2/video/Makefile.am	2001/06/04 13:05:22
@@ -29,13 +29,7 @@
                           tables.c \
                           gstmpeg2play.c  
 
-if HAVE_CPU_I386
-ARCHCFLAGS = -m486
-else
-ARCHCFLAGS = 
-endif
-
-CFLAGS += -O3 $(ARCHCFLAGS) $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math -fschedule-insns2
+CFLAGS += -ffast-math
 
 noinst_HEADERS = gstmpeg2play.h \
                  mpeg2dec.h        \
Index: plugins/mpeg2/videoparse/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mpeg2/videoparse/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/mpeg2/videoparse/Makefile.am	2001/01/14 21:55:41	1.3
+++ plugins/mpeg2/videoparse/Makefile.am	2001/06/04 13:05:22
@@ -6,4 +6,4 @@
 
 noinst_HEADERS = mp2videoparse.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: plugins/quicktime/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/quicktime/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- plugins/quicktime/Makefile.am	2001/05/20 18:59:57	1.2
+++ plugins/quicktime/Makefile.am	2001/06/04 13:05:22
@@ -2,13 +2,13 @@
 
 filter_LTLIBRARIES = libquicktimedecoder.la
 
-CFLAGS += -O6
-
 libquicktimedecoder_la_SOURCES = \
 	gstquicktimedecoder.c
 
 noinst_HEADERS = \
 	gstquicktimedecoder.h
 
-CFLAGS += -O6 $(FOMIT_FRAME_POINTER) -march=i686 -ffast-math -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2
+# don't set march= unconditionally
+# CFLAGS += -O6 $(FOMIT_FRAME_POINTER) -march=i686 -ffast-math -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2
+CFLAGS += -ffast-math -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 LDADD += -lopenquicktime
Index: plugins/sdlsink/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/sdlsink/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/sdlsink/Makefile.am	2001/06/02 10:42:19	1.3
+++ plugins/sdlsink/Makefile.am	2001/06/04 13:05:22
@@ -6,7 +6,7 @@
 
 noinst_HEADERS = sdlvideosink.h
 
-CFLAGS += -O3 -ffast-math -finline-functions $(SDL_CFLAGS)
+CFLAGS += -ffast-math $(SDL_CFLAGS)
 
 libsdlvideosink_la_CFLAGS = $(SDL_CFLAGS)
 libsdlvideosink_la_LIBADD = $(GLIB_LIBS) $(SDL_LIBS)
Index: plugins/videoscale/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/videoscale/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- plugins/videoscale/Makefile.am	2001/01/14 21:55:41	1.3
+++ plugins/videoscale/Makefile.am	2001/06/04 13:05:22
@@ -6,4 +6,4 @@
 
 noinst_HEADERS = videoscale.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+CFLAGS += -funroll-all-loops -ffast-math
Index: plugins/videosink/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/videosink/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- plugins/videosink/Makefile.am	2001/01/14 21:55:41	1.18
+++ plugins/videosink/Makefile.am	2001/06/04 13:05:22
@@ -26,7 +26,7 @@
 imagetest_LDFLAGS = $(shell gnome-config --libs gnomeui) 
 imagetest_SOURCES = imagetest.c gtkoverlayimage.c gdkxvimage.c gtkxvimage.c
 
-CFLAGS += -O3 -ffast-math -finline-functions
+CFLAGS += -ffast-math
 
 libvideosink_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(GSTXVLIBS)
 
Index: plugins/xvideosink/Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/xvideosink/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- plugins/xvideosink/Makefile.am	2001/05/28 19:09:48	1.4
+++ plugins/xvideosink/Makefile.am	2001/06/04 13:05:22
@@ -18,7 +18,7 @@
 # imagetest_LDFLAGS = $(shell gnome-config --libs gnome gnomeui) 
 # imagetest_SOURCES = imagetest.c gstxwindow.c gstximage.c gstxvimage.c
 
-CFLAGS += -O3 -ffast-math -finline-functions
+CFLAGS += -ffast-math
 
 libxvideosink_la_LIBADD = $(GLIB_LIBS) $(GSTXVLIBS)
 
-------------- next part --------------
Index: configure.base
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/configure.base,v
retrieving revision 1.16
diff -u -r1.16 configure.base
--- configure.base	2001/06/02 23:36:42	1.16
+++ configure.base	2001/06/04 12:53:58
@@ -141,6 +141,19 @@
               AC_DEFINE(HAVE_CPU_SPARC, 1, [Define if the target CPU is a PPC]) ;;
 esac
 
+dnl Set CPU specific compiler options
+if test "x$RPM_OPT_FLAGS" = "x" ; then
+  if test "x$HAVE_CPU_I386" = xyes ; then
+    dnl egcs does not know '-march=k6'
+    case "x${target_cpu}" in
+      k?) CFLAGS="$CFLAGS -march=i586"          ;;
+      *)  CFLAGS="$CFLAGS -march=${target_cpu}" ;;
+    esac
+  fi
+else
+  CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+fi
+
 dnl Determine endianness
 AC_C_BIGENDIAN
 
Index: gstreamer.spec.in
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gstreamer.spec.in,v
retrieving revision 1.9
diff -u -r1.9 gstreamer.spec.in
--- gstreamer.spec.in	2001/06/02 10:40:20	1.9
+++ gstreamer.spec.in	2001/06/04 12:53:58
@@ -53,7 +53,7 @@
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+./configure --prefix=%prefix
 
 if [ "$SMP" != "" ]; then
   (make "MAKE=make -k -j $SMP"; exit 0)

More information about the gstreamer-devel mailing list