Firebird now uses user CFLAGS instead its own, bug #108275, thanks to vapier

(Portage version: 2.1_pre3-r1)

3 files changed, 65 insertions, 4 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 42b8d8dd57e8..533f030cb198 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/firebird
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.35 2005/12/30 23:48:35 carlo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.36 2006/01/24 22:10:44 sekretarz Exp $
+
+  24 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/firebird-1.5.2-build.patch, firebird-1.5.2.ebuild:
+  Firebird now uses user CFLAGS instead its own, bug #108275, thanks to vapier
 
   30 Dec 2005; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild,
   firebird-1.5.2.ebuild:
diff --git a/dev-db/firebird/files/firebird-1.5.2-build.patch b/dev-db/firebird/files/firebird-1.5.2-build.patch
new file mode 100644
index 000000000000..5e0ae7305586
--- /dev/null
+++ b/dev-db/firebird/files/firebird-1.5.2-build.patch
@@ -0,0 +1,50 @@
+--- configure.in
++++ configure.in
+@@ -386,7 +386,7 @@
+ AC_CHECK_LIB(c,main)
+ AC_CHECK_LIB(m, main)
+ AC_CHECK_LIB(crypt, main)
+-AC_CHECK_LIB(curses, main)
++AC_CHECK_LIB(ncurses, main)
+ dnl AC_CHECK_LIB(termcap, main)
+ if test "$EDITLINE_FLG" = "Y"; then
+   AC_SUBST(EDITLINE_A, -leditline)
+--- builds/posix/prefix.linux
++++ builds/posix/prefix.linux
+@@ -22,8 +22,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
+-PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC
+-DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
++PROD_FLAGS=-fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -MMD -fPIC
++DEV_FLAGS=-DLINUX -DDEBUG_GDS_ALLOC -MMD -fPIC -Wall -Wno-switch
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
+--- builds/posix/prefix.linux_amd64
++++ builds/posix/prefix.linux_amd64
+@@ -20,8 +20,8 @@
+ 
+ LD=@CXX@
+ 
+-PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
+-DEV_FLAGS=-ggdb -DLINUX -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
++PROD_FLAGS=-fno-omit-frame-pointer -DNDEBUG -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
++DEV_FLAGS=-DLINUX -DAMD64 -MMD -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
+--- builds/posix/prefix.linux_sparc32
++++ builds/posix/prefix.linux_sparc32
+@@ -22,8 +22,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
+-PROD_FLAGS=-m32 -mcpu=ultrasparc -mtune=ultrasparc -O3 -DNDEBUG -DLINUX -pipe -MMD -fPIC -Dsparc
+-DEV_FLAGS=-ggdb -m32 -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Dsparc
++PROD_FLAGS=-DNDEBUG -DLINUX -MMD -fPIC -Dsparc
++DEV_FLAGS=--DLINUX -DDEBUG_GDS_ALLOC -MMD -fPIC -Wall -Wno-switch -Dsparc
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
diff --git a/dev-db/firebird/firebird-1.5.2.ebuild b/dev-db/firebird/firebird-1.5.2.ebuild
index 4217effd7444..f44783d99288 100644
--- a/dev-db/firebird/firebird-1.5.2.ebuild
+++ b/dev-db/firebird/firebird-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.2.ebuild,v 1.6 2005/12/30 23:48:35 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.2.ebuild,v 1.7 2006/01/24 22:10:44 sekretarz Exp $
 
 inherit flag-o-matic eutils
 
@@ -25,6 +25,13 @@ pkg_setup() {
 	enewuser firebird 450 /bin/bash /opt/firebird firebird
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-build.patch
+}
+
 src_compile() {
 	# fix bug #33584
 	#strip-flags -funroll-loops