From 547dc4006a6ddca32912a8858bcae71e5caa19a9 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 17 Aug 2004 14:42:46 +0000 Subject: [PATCH] Clifford Wolf: Fixed handling of gcc -m options in cmd_wrapper This fixes ffmpeg and some others [2004081417355213745] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3898 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/x86/gcc-options | 4 +++- package/base/gcc/parse-config | 5 ++++- package/rene/ffmpeg/ffmpeg.conf | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/architecture/x86/gcc-options b/architecture/x86/gcc-options index f609b64f3..a0a8a388f 100644 --- a/architecture/x86/gcc-options +++ b/architecture/x86/gcc-options @@ -4,7 +4,6 @@ case "$ROCKCFG_X86_OPT" in via-c3) var_append GCC3_WRAPPER_INSERT " " "-march=k62" ;; via-c3-improved) - #var_append GCC3_WRAPPER_INSERT " " "-s -O3 -march=i686 -fomit-frame-pointer -falign-functions=4 -funroll-loops -fexpensive-optimizations -malign-double -fschedule-insns2" ;; var_append GCC3_WRAPPER_INSERT " " "-march=i686" ;; via-c3-2) var_append GCC3_WRAPPER_INSERT " " "-march=pentium-mmx" ;; @@ -33,3 +32,6 @@ case "$ROCKCFG_X86_OPT" in var_append GCC2_WRAPPER_INSERT " " "-march=i686" ;; esac +# remove other -march and -mcpu options from the argument list +var_insert GCC_WRAPPER_REMOVE " " "-march=* -mcpu=*" + diff --git a/package/base/gcc/parse-config b/package/base/gcc/parse-config index a1ce743dc..87949d0cc 100644 --- a/package/base/gcc/parse-config +++ b/package/base/gcc/parse-config @@ -80,7 +80,10 @@ else var_insert GCC_WRAPPER_REMOVE " " "-s -g*" fi fi -var_insert GCC_WRAPPER_REMOVE " " "-O -O[0-9s] -m*" + +# remove other -O options from the argument list +var_insert GCC_WRAPPER_REMOVE " " "-O -O[0-9s]" + case "$ROCKCFG_OPT" in smart) var_insert GCC_WRAPPER_INSERT " " "-SPEED-O2 -SIZE-Os -pipe" diff --git a/package/rene/ffmpeg/ffmpeg.conf b/package/rene/ffmpeg/ffmpeg.conf index a8ae69ce1..99fb347d2 100644 --- a/package/rene/ffmpeg/ffmpeg.conf +++ b/package/rene/ffmpeg/ffmpeg.conf @@ -25,6 +25,5 @@ pkginstalled lame && var_append extraconfopt " " "--enable-mp3lame" pkginstalled ogg-vorbis && var_append extraconfopt " " "--enable-vorbis" pkginstalled a52dec && var_append extraconfopt " " "--enable-a52 --enable-gpl" -# MMX optimizations currently don't compile (version 0.4.8) -var_append confopt " " "--disable-mmx --enable-shared --enable-pp" +var_append confopt " " "--enable-shared --enable-pp"