Gcc3 related fixes and correct setting of CFLAGS

4 files changed, 67 insertions, 5 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 39a9614cf1e9..ae5d0544d5d8 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/sather
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.1 2002/03/20 19:19:43 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.2 2002/03/22 08:18:46 gbevin Exp $
+
+*firebird-1.0-r1 (22 Mar 2002)
+
+  22 Mar 2002; G.Bevin <gbevin@gentoo.org> firebird-1.0-r1.ebuild
+  files/firebird-1.0-r1 files/firebird-1.0-gentoo.patch:
+  
+  Fixes for compilation with gcc3 and setting of make.conf CFLAGS.
 
 *firebird-1.0 (20 Mar 2002)
 
diff --git a/dev-db/firebird/files/digest-firebird-1.0 b/dev-db/firebird/files/digest-firebird-1.0-r1
index 12dfb208bcd3..12dfb208bcd3 100644
--- a/dev-db/firebird/files/digest-firebird-1.0
+++ b/dev-db/firebird/files/digest-firebird-1.0-r1
diff --git a/dev-db/firebird/files/firebird-1.0-gentoo.patch b/dev-db/firebird/files/firebird-1.0-gentoo.patch
new file mode 100644
index 000000000000..756556cb8a0f
--- /dev/null
+++ b/dev-db/firebird/files/firebird-1.0-gentoo.patch
@@ -0,0 +1,56 @@
+diff -u -r firebird-1.0.0.796_orig/builds/original/build_kit firebird-1.0.0.796/builds/original/build_kit
+--- firebird-1.0.0.796_orig/builds/original/build_kit	2001-08-06 17:34:57.000000000 +0200
++++ firebird-1.0.0.796/builds/original/build_kit	2002-03-22 09:09:22.000000000 +0100
+@@ -67,7 +67,7 @@
+ 
+ #
+ 
+-LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib
++LD_LIBRARY_PATH=$CURDIR/jrd:$CURDIR/interbase/lib:$INTERBASE/lib
+ SHLIB_PATH=$CURDIR/jrd
+ 
+ export LD_LIBRARY_PATH
+diff -u -r firebird-1.0.0.796_orig/builds/original/prefix.linux firebird-1.0.0.796/builds/original/prefix.linux
+--- firebird-1.0.0.796_orig/builds/original/prefix.linux	2002-03-08 12:42:26.000000000 +0100
++++ firebird-1.0.0.796/builds/original/prefix.linux	2002-03-22 09:07:31.000000000 +0100
+@@ -33,7 +33,7 @@
+ PROD_DEBUG_OBJECTS=	nodebug.o
+ PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
+ PROD_VERSION_FLAG=	-DPROD_BUILD
+-PROD_CFLAGS=            -O3 -m486 -fpic -DFLINTSTONE
++PROD_CFLAGS=        $(GENTOO_CFLAGS) -fpic -DFLINTSTONE
+ 
+ 
+ DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
+diff -u -r firebird-1.0.0.796_orig/jrd/misc.c firebird-1.0.0.796/jrd/misc.c
+--- firebird-1.0.0.796_orig/jrd/misc.c	2000-08-03 22:50:58.000000000 +0200
++++ firebird-1.0.0.796/jrd/misc.c	2002-03-22 09:07:02.000000000 +0100
+@@ -73,16 +73,16 @@
+    pop the arguments off the call stack and put
+    them into the passed buffer */
+ 
+-while (arg_type = va_arg (ptr, SCHAR))
++while (arg_type = va_arg (ptr, int))
+     switch (arg_type)
+ 	{
+ 	case dtype_byte: /* byte */
+-	    ch = va_arg (ptr, SCHAR);
++	    ch = va_arg (ptr, int);
+ 	    STUFF (p, ch);
+ 	    break;
+ 
+ 	case dtype_short: /* short value */
+-	    sh = va_arg (ptr, USHORT);
++	    sh = va_arg (ptr, int);
+ 	    STUFF_SHORT (p, sh);
+ 	    break;
+ 
+@@ -97,7 +97,7 @@
+ 	    break;
+ 
+ 	case dtype_varying: /* short value followed by a value with that many bytes */
+-	    sh = va_arg (ptr, USHORT);
++	    sh = va_arg (ptr, int);
+ 	    STUFF_SHORT (p, sh);
+ 	    q = va_arg (ptr, UCHAR*);
+ 	    STUFF_BYTES (p, q, sh);
diff --git a/dev-db/firebird/firebird-1.0.ebuild b/dev-db/firebird/firebird-1.0-r1.ebuild
index ab69b2a7b5b5..d9c2b6ca219c 100644
--- a/dev-db/firebird/firebird-1.0.ebuild
+++ b/dev-db/firebird/firebird-1.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Geert Bevin <gbevin@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0.ebuild,v 1.2 2002/03/21 12:09:39 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0-r1.ebuild,v 1.1 2002/03/22 08:18:47 gbevin Exp $
 
 S=${WORKDIR}/firebird-1.0.0.796
 
@@ -23,9 +23,7 @@ src_unpack() {
 	tar xzf buildroot.tar.gz
 
 	cd ${S}
-	cp builds/original/build_kit builds/original/build_kit_orig
-	sed "s#LD_LIBRARY_PATH=\$CURDIR/jrd:\$CURDIR/interbase/lib#LD_LIBRARY_PATH=\$CURDIR/jrd:\$CURDIR/interbase/lib:\$INTERBASE/lib#" \
-		builds/original/build_kit_orig > builds/original/build_kit
+	patch -p1 < ${FILESDIR}/firebird-1.0-gentoo.patch
 }
 
 src_compile() {
@@ -33,6 +31,7 @@ src_compile() {
 	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INTERBASE/lib"
 	export FIREBIRD_64_BIT_IO="1"
 	export NOPROMPT_SETUP="1"
+	export GENTOO_CFLAGS=$CFLAGS
 	./Configure.sh PROD || die
 	cd ${S}/interbase/lib
 	ln -s gds.so libgds.so