diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2004-10-06 05:07:36 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2004-10-06 05:07:36 +0000 |
| commit | c545d87f456250e67f60cbb0835805a5ffbf5e14 (patch) | |
| tree | aa9c91bffeae9122febeb6e7bed992197cd55ba2 /graphics/evolvotron/files/patch-common.pro | |
| parent | Fix the code so GCC 3.4.2 likes it better, and unbreak. (diff) | |
Upgrade to 0.3.1 to unbreak with recent GCC.
Reported by: kris
Approved by: portmgr (krion, will), fjoe (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=118561
Diffstat (limited to 'graphics/evolvotron/files/patch-common.pro')
| -rw-r--r-- | graphics/evolvotron/files/patch-common.pro | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/graphics/evolvotron/files/patch-common.pro b/graphics/evolvotron/files/patch-common.pro index f7338521594a..a906227347f0 100644 --- a/graphics/evolvotron/files/patch-common.pro +++ b/graphics/evolvotron/files/patch-common.pro @@ -1,18 +1,18 @@ --- common.pro.orig Mon Nov 3 09:40:15 2003 +++ common.pro Mon Dec 1 03:16:47 2003 -@@ -29,8 +29,6 @@ +@@ -29,32 +29,12 @@ # Now leaving these ON for general distribution as they DO have SOME effect # (or at least they have in the past... see the README), and should be portable. - + # NB Switching on -funroll-loops causes some versions of gcc to segv -QMAKE_CXXFLAGS_RELEASE -= -O2 --QMAKE_CXXFLAGS_RELEASE += -O3 -fomit-frame-pointer -funroll-loops -ffast-math +-QMAKE_CXXFLAGS_RELEASE += -O3 -fomit-frame-pointer -ffast-math ################## # Architecture specific optimisations -@@ -38,23 +36,6 @@ + # The following architecture options make the compiled executables less portable. # (On a different setup you may need to change what's subtracted out of the flags.) # NB -march=X implies -mcpu=X... no need to specify both the same - +- -contains(CONFIG_OPTS, p4 ){ - QMAKE_CXXFLAGS_RELEASE -= -march=i386 -mcpu=i686 - QMAKE_CXXFLAGS_RELEASE += -march=pentium4 -mfpmath=sse -msse2 @@ -33,12 +33,3 @@ ################## # Optimisation insanity -@@ -67,7 +48,7 @@ - ####################################### - # Version numbering. This is ENTIRELY controlled by what is echoed by the VERSION script - --VERSION_NUMBER = $${system(../VERSION)} -+VERSION_NUMBER = $${system(./VERSION)} - QMAKE_CXXFLAGS_RELEASE += '-DEVOLVOTRON_VERSION="$$VERSION_NUMBER"' - QMAKE_CXXFLAGS_DEBUG += '-DEVOLVOTRON_VERSION="$$VERSION_NUMBER"' - QMAKE_CXXFLAGS_RELEASE += '-DEVOLVOTRON_BUILD="$$VERSION_NUMBER (Build options: $$BUILD_INFO Release)"' |