Added patch for custom flags vs default hard coded, thanks to cla there :). Removed past 2.1 beta version.

Package-Manager: portage-2.1.3.17

4 files changed, 35 insertions, 0 deletions

diff --git a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3
new file mode 100644
index 000000000000..9d8d28d4fe6b
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3
@@ -0,0 +1,6 @@
+MD5 9a28587a596a149eb01f006be1cb2ddb Firebird-2.0.3.12981-0.tar.bz2 12623689
+RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 Firebird-2.0.3.12981-0.tar.bz2 12623689
+SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e Firebird-2.0.3.12981-0.tar.bz2 12623689
+MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
+RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
+SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1
index f63a1165d43f..f63a1165d43f 100644
--- a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
+++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
new file mode 100644
index 000000000000..c1cc28edab90
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
@@ -0,0 +1,12 @@
+diff -Naur Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux Firebird-2.0.3.12981-0/builds/posix/prefix.linux
+--- Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux	2007-11-05 21:07:48.000000000 -0500
++++ Firebird-2.0.3.12981-0/builds/posix/prefix.linux	2007-11-05 21:23:36.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ # -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 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
++PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC
+ DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ 
diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch
index 62319ecb08be..de9459cc797f 100644
--- a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
+++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch
@@ -96,6 +96,23 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Fire
  	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
  
  
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux	2007-11-05 21:31:20.000000000 -0500
+@@ -21,11 +21,10 @@
+ # -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=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ 
+-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
+ DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
+ #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
+ 
 diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
 --- Firebird-2.1.0.16780-Beta2_orig/configure	2007-10-19 11:11:39.000000000 -0400
 +++ Firebird-2.1.0.16780-Beta2/configure	2007-10-19 11:26:19.000000000 -0400