From 165c7cb45df29c3a40467fe64a9f9f6d7602c9f6 Mon Sep 17 00:00:00 2001 From: lofi Date: Fri, 3 Sep 2004 21:48:56 +0000 Subject: Fix build on gcc 3.4 --- multimedia/ffmpeg-devel/Makefile | 16 ++++++++++++++-- multimedia/ffmpeg/Makefile | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) (limited to 'multimedia') diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 311af3bd5356..96a7eb99b34f 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -133,12 +133,24 @@ LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-mp3lame .endif ## optimization -.ifdef(WITH_OPTIMIZED_CFLAGS) +.if ${OSVERSION} > 502124 +. ifdef(WITH_OPTIMIZED_CFLAGS) CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ -I${X11BASE}/include \ - -ffast-math -fomit-frame-pointer" \ + -ffast-math -fomit-frame-pointer -fno-unit-at-a-time" \ --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +. else +CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ + -I${X11BASE}/include -fno-unit-at-a-time" \ + --disable-opts \ + --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm " +. endif .else +CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ + -I${X11BASE}/include \ + -ffast-math -fomit-frame-pointer" \ + --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +. else CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ -I${X11BASE}/include" \ --disable-opts \ diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 311af3bd5356..96a7eb99b34f 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -133,12 +133,24 @@ LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-mp3lame .endif ## optimization -.ifdef(WITH_OPTIMIZED_CFLAGS) +.if ${OSVERSION} > 502124 +. ifdef(WITH_OPTIMIZED_CFLAGS) CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ -I${X11BASE}/include \ - -ffast-math -fomit-frame-pointer" \ + -ffast-math -fomit-frame-pointer -fno-unit-at-a-time" \ --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +. else +CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ + -I${X11BASE}/include -fno-unit-at-a-time" \ + --disable-opts \ + --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm " +. endif .else +CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ + -I${X11BASE}/include \ + -ffast-math -fomit-frame-pointer" \ + --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +. else CONFIGURE_ARGS+= --extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \ -I${X11BASE}/include" \ --disable-opts \ -- cgit