- actually use optflags

Changed files:
    Firebird-opt.patch -> 1.1
    Firebird.spec -> 1.76

diff --git a/Firebird-opt.patch b/Firebird-opt.patch
new file mode 100644 (file)
index 0000000..67bc258
--- /dev/null
+++ b/Firebird-opt.patch
@@ -0,0 +1,137 @@
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux.orig      2007-05-03 13:24:50.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux   2010-08-29 10:48:00.738823295 +0200
+@@ -21,8 +21,8 @@
+ # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
+ # you may remove it if engine is getting compiled with any other GCC version
+ 
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ 
+ PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_amd64.orig        2007-05-03 13:24:50.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_amd64     2010-08-29 10:48:42.742820781 +0200
+@@ -18,8 +18,8 @@
+ #
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup
+ 
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer 
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_arm.orig  2008-04-15 16:11:33.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_arm       2010-08-29 10:50:20.766823295 +0200
+@@ -23,11 +23,11 @@
+ 
+ #LD=@CXX@
+ 
+-#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -DLINUX -pipe -MMD -fPIC
+-#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
++COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
++OPTIMIZE_FLAGS=
+ 
+-PROD_FLAGS=-O3 -DNDEBUG -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
+-DEV_FLAGS=-ggdb -DLINUX -DARM -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -Wall
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_generic.orig      2007-05-03 13:24:50.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_generic   2010-08-29 10:50:59.358822457 +0200
+@@ -18,10 +18,11 @@
+ #
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup
+ 
+-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
++COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
++OPTIMIZE_FLAGS=
+ 
+-PROD_FLAGS=-ggdb -O3 -DNDEBUG $(COMMON_FLAGS)
+-DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS)
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=-Wall -Wno-switch $(COMMON_FLAGS)
+ CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+ 
+ OS_ServerFiles=inet_server.cpp
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_ia64.orig 2008-05-31 04:33:45.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_ia64      2010-08-29 10:51:21.938821619 +0200
+@@ -18,8 +18,8 @@
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup
+ # Adriano dos Santos Fernandes
+ 
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer 
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_mips.orig 2008-01-17 13:20:44.000000000 +0100
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_mips      2010-08-29 10:51:45.386816591 +0200
+@@ -1,5 +1,5 @@
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin
++COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ 
+ PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_mipsel.orig       2007-05-04 03:18:21.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_mipsel    2010-08-29 10:58:57.222819943 +0200
+@@ -19,10 +19,12 @@
+ 
+ LD=@CXX@
+ 
+-# -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
+-# you may remove it if engine is getting compiled with any other GCC version
+-PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -DLINUX -pipe -MMD -fPIC
+-DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
++COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer
++WARN_FLAGS=-Wall -Wno-switch
++
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=-DDEBUG_GDS_ALLOC -p $(COMMON_FLAGS) $(WARN_FLAGS)
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_powerpc.orig      2007-05-03 13:24:50.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_powerpc   2010-08-29 11:01:16.790816591 +0200
+@@ -18,9 +18,12 @@
+ #
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup
+ 
+-PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 -mcpu=powerpc
+-DEV_FLAGS=-ggdb -O0 -DVIO_DEBUG -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC
+-#DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC
++COMMON_FLAGS=@CFLAGS@ -DLINUX -DPowerPC -DPPC -fsigned-char -pipe -MMD -fPIC -fmessage-length=0
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer
++WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
++
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=-DVIO_DEBUG -p $(COMMON_FLAGS) $(WARN_FLAGS)
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
+--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_sparc32.orig      2007-05-03 13:24:50.000000000 +0200
++++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_sparc32   2010-08-29 11:04:26.538821619 +0200
+@@ -18,9 +18,10 @@
+ #
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup
+ 
+-COMMON_FLAGS=-m32 -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
+-PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 -DNDEBUG $(COMMON_FLAGS)
+-DEV_FLAGS=-ggdb -p -Wall -Wno-switch  $(COMMON_FLAGS)
++COMMON_FLAGS=@CFLAGS@ -m32 -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
++
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
++DEV_FLAGS=-p -Wall -Wno-switch  $(COMMON_FLAGS)
+ CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+ 
+ OS_ServerFiles=inet_server.cpp

diff --git a/Firebird.spec b/Firebird.spec
index 681859bd68d43d7664acdd9feba834bf8e91303a..4073264fd2aeb29c70f570c408f86d01e16216fa 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -49,6 +49,7 @@ Patch4:               %{name}-FHS.patch
 Patch5:                %{name}-64bit.patch
 Patch6:                %{name}-gcc-icu.patch
 Patch7:                %{name}-btyacc-segv.patch
+Patch8:                %{name}-opt.patch
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
@@ -167,6 +168,7 @@ Obszerna dokumentacja do baz InterBase i Firebird.
 %patch5 -p1
 %patch6 -p0
 %patch7 -p1
+%patch8 -p1
 
 %{__sed} -i 's,@prefix@,%{_prefix},' builds/install/misc/fb_config.in
 
@@ -176,6 +178,10 @@ rm -f src/dsql/parse.cpp
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
 
+# not processed by configure
+%{__sed} -i -e 's/^CFLAGS.*$/& %{rpmcflags}/' extern/btyacc/Makefile
+%{__sed} -i -e 's/^\(CC.*= \)gcc$/\1 %{__cc}/' extern/btyacc/Makefile
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -191,22 +197,9 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
        --prefix=%{ibdir} \
        %{?debug:--enable-debug}
 
-DARCH=""
-%ifarch %{x8664}
-DARCH="-DAMD64"
-%endif
-%ifarch sparc sparcv9
-DARCH="-Dsparc"
-%endif
-%ifarch ppc
-DARCH="-DPPC"
-%endif
-
 %{__make} -j1 \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
-       PROD_FLAGS="%{rpmcflags} -DNDEBUG -DLINUX -pipe -MMD -fPIC $DARCH" \
-       DEV_FLAGS="%{rpmcflags} -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -fPIC -Wall -Wno-switch $DARCH" \
        LIB_LINK_RPATH_LINE= \
        LIB_CLIENT_LINK_OPTIONS="-lpthread"