diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-03-26 23:32:56 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-03-26 23:32:56 +0300 |
commit | f247812a28c090b0edaf0339144f8c402b829ccb (patch) | |
tree | 8c7fbca8337bdffd0c40c798f8d69b59fe9f9efa /build | |
parent | 65c931fc8dd0f7379ee23aa57fa96aa5f2f70008 (diff) | |
download | manaverse-f247812a28c090b0edaf0339144f8c402b829ccb.tar.gz manaverse-f247812a28c090b0edaf0339144f8c402b829ccb.tar.bz2 manaverse-f247812a28c090b0edaf0339144f8c402b829ccb.tar.xz manaverse-f247812a28c090b0edaf0339144f8c402b829ccb.zip |
Switch by default in build scripts to gcc 4.7.
Add gcc 4.5 build script.
Diffstat (limited to 'build')
-rwxr-xr-x | build/bmake | 53 | ||||
-rwxr-xr-x | build/bmake0 | 54 | ||||
-rwxr-xr-x | build/bmake45 | 60 | ||||
-rwxr-xr-x | build/pmake | 41 |
4 files changed, 121 insertions, 87 deletions
diff --git a/build/bmake b/build/bmake index 33df5d180..1edc5468e 100755 --- a/build/bmake +++ b/build/bmake @@ -2,58 +2,39 @@ cd .. -#may be -#-Waggregate-return -Winline - -#for feature -#-Wstrict-overflow=4 -Wfloat-equal -#-Wunsafe-loop-optimizations -#-Woverloaded-virtual -#-Wformat=2 -#-Wswitch-enum - -#for better code -# -Weffc++ - -#need fix: -Wold-style-cast -Wconversion -#prof -pg - dir=`pwd` -export CC=gcc-4.5 -export CXX=g++-4.5 +export CC=gcc-4.7 +export CXX=g++-4.7 export LANG=C -export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ --Wabi -Wdisabled-optimization -Wuninitialized \ + +export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ +-Wpacked-bitfield-compat -Wtrampolines \ +-Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ +-fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \ -Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ -Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ -Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ --Wctor-dtor-privacy -Wstrict-null-sentinel \ --Wunused-parameter -Wlogical-op \ --Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ --Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ --Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ --Wpacked -Wshadow -Wunused -Wsynth \ +-Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ +-Wcast-align -Wpointer-arith -Wundef \ +-Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ +-Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ --Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2" +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ +-Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant" autoreconf -i ./configure --prefix=$dir/run \ --datadir=$dir/run/share/games \ --bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=yes \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no - -#--enable-applebuild=yes -#--without-librt +--mandir=$dir/run/share/man cd po -#make -j5 update-po 2>../make1.log make -j5 update-gmo 2>../build/make1.log cd .. make -j5 2>build/make2.log diff --git a/build/bmake0 b/build/bmake0 index 8dcb357fe..df9b8eb53 100755 --- a/build/bmake0 +++ b/build/bmake0 @@ -2,55 +2,39 @@ cd .. -#may be -#-Wshadow -Waggregate-return -Winline - -#for feature -#-Wstrict-overflow=4 -Wfloat-equal -#-Wunsafe-loop-optimizations -#-Wnon-virtual-dtor -#-Woverloaded-virtual -#-Wformat=2 -#-Wswitch-enum - -#for better code -# -Weffc++ - -#need fix: -Wold-style-cast -Wconversion -#prof -pg - dir=`pwd` -export CC=gcc-4.5 -export CXX=g++-4.5 +export CC=gcc-4.7 +export CXX=g++-4.7 export LANG=C -export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ --Wabi -Wdisabled-optimization -Wuninitialized \ + +export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ +-Wpacked-bitfield-compat -Wtrampolines \ +-Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ +-fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \ -Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ -Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ -Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ --Wctor-dtor-privacy -Wstrict-null-sentinel \ --Wunused-parameter -Wlogical-op \ --Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ --Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ --Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O0 -pipe \ --fno-default-inline -fno-inline" +-Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ +-Wcast-align -Wpointer-arith -Wundef \ +-Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O0 -pipe \ +-Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ +-Wstack-protector -Wshadow -Wunused-macros -Wsynth \ +-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ +-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ +-Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant" autoreconf -i ./configure --prefix=$dir/run \ --datadir=$dir/run/share/games \ --bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=yes \ ---enable-googleprofiler=yes - -#--without-librt +--mandir=$dir/run/share/man cd po -#make -j5 update-po 2>../build/make1.log make -j5 update-gmo 2>../build/make1.log cd .. make -j5 2>build/make2.log diff --git a/build/bmake45 b/build/bmake45 new file mode 100755 index 000000000..33df5d180 --- /dev/null +++ b/build/bmake45 @@ -0,0 +1,60 @@ +#!/bin/sh + +cd .. + +#may be +#-Waggregate-return -Winline + +#for feature +#-Wstrict-overflow=4 -Wfloat-equal +#-Wunsafe-loop-optimizations +#-Woverloaded-virtual +#-Wformat=2 +#-Wswitch-enum + +#for better code +# -Weffc++ + +#need fix: -Wold-style-cast -Wconversion +#prof -pg + +dir=`pwd` + +export CC=gcc-4.5 +export CXX=g++-4.5 + +export LANG=C +export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ +-Wabi -Wdisabled-optimization -Wuninitialized \ +-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ +-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ +-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ +-Wctor-dtor-privacy -Wstrict-null-sentinel \ +-Wunused-parameter -Wlogical-op \ +-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ +-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wshadow -Wunused -Wsynth \ +-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ +-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2" + +autoreconf -i +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no + +#--enable-applebuild=yes +#--without-librt + +cd po +#make -j5 update-po 2>../make1.log +make -j5 update-gmo 2>../build/make1.log +cd .. +make -j5 2>build/make2.log + diff --git a/build/pmake b/build/pmake index b51e40734..a7b93f9a1 100755 --- a/build/pmake +++ b/build/pmake @@ -4,29 +4,38 @@ cd .. dir=`pwd` -export CC=gcc-4.6 -export CXX=g++-4.6 - -#-D_GLIBCXX_PROFILE +export CC=gcc-4.7 +export CXX=g++-4.7 export LANG=C -export CXXFLAGS="-pg -fno-inline -Wunreachable-code -Wmissing-field-initializers \ --Wabi -Wdisabled-optimization -Wuninitialized \ + +export CXXFLAGS="-pg -fno-inline -Wvariadic-macros -Wvla -Wredundant-decls \ +-Wpacked-bitfield-compat -Wtrampolines \ +-Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ +-fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \ -Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ -Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ -Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ --Wctor-dtor-privacy -Wstrict-null-sentinel \ --Wunused-parameter -Wredundant-decls -Wlogical-op \ --Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ --Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ --Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O0 -pipe \ --fno-default-inline -fno-inline" +-Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ +-Wcast-align -Wpointer-arith -Wundef \ +-Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ +-Wstack-protector -Wshadow -Wunused-macros -Wsynth \ +-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ +-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ +-Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant" autoreconf -i ./configure --prefix=$dir/run \ - --datadir=$dir/run/share/games \ - --bindir=$dir/run/bin \ - --mandir=$dir/run/share/man +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man -make -j5 2>build/make.log +cd po +make -j5 update-gmo 2>../build/make1.log +cd .. +make -j5 2>build/make2.log |