I uploaded an NMU for these bugs with the patches available in the BTS.
Full NMU patch attached.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur aleph-0.9.0/cnf/bin/aleph-vcomp aleph-0.9.0.nmu/cnf/bin/aleph-vcomp
--- aleph-0.9.0/cnf/bin/aleph-vcomp 2003-10-01 22:46:07.000000000 +0200
+++ aleph-0.9.0.nmu/cnf/bin/aleph-vcomp 2005-08-05 19:35:14.715569120 +0200
@@ -31,6 +31,7 @@
case $vers in
2.*) version=2;;
3.*) version=3;;
+ 4.*) version=4;;
*) version=;;
esac
}
diff -Naur aleph-0.9.0/cnf/mak/aleph-gcc-4.mak
aleph-0.9.0.nmu/cnf/mak/aleph-gcc-4.mak
--- aleph-0.9.0/cnf/mak/aleph-gcc-4.mak 1970-01-01 01:00:00.000000000 +0100
+++ aleph-0.9.0.nmu/cnf/mak/aleph-gcc-4.mak 2005-08-05 19:35:14.716568968
+0200
@@ -0,0 +1,111 @@
+# ----------------------------------------------------------------------------
+# - aleph-gcc -
+# - aleph compiler configuration - gcc configuration -
+# ----------------------------------------------------------------------------
+# - This program is free software; you can redistribute it and/or modify -
+# - it provided that this copyright notice is kept intact. -
+# - -
+# - This program is distributed in the hope that it will be useful, but -
+# - without any warranty; without even the implied warranty of -
+# - merchantability or fitness for a particular purpose. In not event shall -
+# - the copyright holder be liable for any direct, indirect, incidental or -
+# - special damages arising in any way out of the use of this software. -
+# ----------------------------------------------------------------------------
+# - copyright (c) 1999-2003 amaury darsch -
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# - compiler and linker section -
+# ----------------------------------------------------------------------------
+
+CC = g++
+LD = gcc
+LK = gcc
+AR = ar rc
+STDCCFLAGS = -Wall -Werror -MMD -fno-builtin
+STACCFLAGS =
+DYNCCFLAGS = -fPIC
+PLTCCFLAGS =
+DEBUGFLAGS = -g
+OPTCCFLAGS = -O2
+PFLCCFLAGS = -g -pg
+COVCCFLAGS = -g -fprofile-arcs -ftest-coverage
+CPPCCFLAGS = -nostdinc -nostdinc++
+CXXCCFLAGS =
+STDDEFINES = -D_REENTRANT
+DBGDEFINES = -DDEBUG
+OPTDEFINES =
+STDINCLUDE =
+ALPCPPTYPE = GNU
+ALPCPPVERS = 3
+
+# ----------------------------------------------------------------------------
+# - compiler dependant libraries -
+# ----------------------------------------------------------------------------
+
+ALPCPPLIBS = -lsupc++
+
+# ----------------------------------------------------------------------------
+# - platform dependant linking flags -
+# ----------------------------------------------------------------------------
+
+# adjust for linux platform
+ifeq ($(PLATNAME),linux)
+LDFLAGS = -shared
+ifeq ($(LKMODE),soname)
+LDFLAGS += -Wl,-soname,$(SONAME)
+endif
+endif
+
+# adjust for solaris platform
+ifeq ($(PLATNAME),solaris)
+LDFLAGS = -shared
+ifeq ($(LKMODE),soname)
+LDFLAGS += -Wl,-h,$(SONAME)
+endif
+OPTCCFLAGS =
+endif
+
+# adjust for freebsd platform
+ifeq ($(PLATNAME),freebsd)
+LDFLAGS = -shared
+ifeq ($(LKMODE),soname)
+LDFLAGS += -Wl,-soname,$(SONAME)
+endif
+endif
+
+# ----------------------------------------------------------------------------
+# - platform dependant final executable flags -
+# ----------------------------------------------------------------------------
+
+LKFLAGS =
+
+# adjust linker flags for freebsd
+ifeq ($(PLATNAME),freebsd)
+LKFLAGS = -pthread
+endif
+
+# ----------------------------------------------------------------------------
+# - platform dependant compilation flags -
+# ----------------------------------------------------------------------------
+
+# adjust platform flag for static or dynamic
+ifeq ($(LKTYPE),dynamic)
+PLTCCFLAGS += $(DYNCCFLAGS)
+endif
+ifeq ($(LKTYPE),static)
+PLTCCFLAGS += $(STACCFLAGS)
+endif
+
+# adjust intel processor
+ifeq ($(PROCNAME)-$(PROCTYPE),ia-586)
+PLTCCFLAGS += -mcpu=i586
+endif
+ifeq ($(PROCNAME)-$(PROCTYPE),ia-686)
+PLTCCFLAGS += -mcpu=i686
+endif
+
+# adjust sparc processor
+ifeq ($(PROCNAME)-$(PROCTYPE),sparc-ultra)
+PLTCCFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+endif
diff -Naur aleph-0.9.0/debian/changelog aleph-0.9.0.nmu/debian/changelog
--- aleph-0.9.0/debian/changelog 2005-08-05 19:44:17.741016704 +0200
+++ aleph-0.9.0.nmu/debian/changelog 2005-08-05 19:40:44.188481624 +0200
@@ -1,3 +1,11 @@
+aleph (0.9.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload during BSP.
+ * Apply patches by Matt Kraai and Karl Chen to fix build with
+ gcc 3.4 and 4.0 (Closes: #317491, #276735)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Fri, 5 Aug 2005 19:35:18 +0200
+
aleph (0.9.0-2) unstable; urgency=low
* Fixed the get-orig-source target in debian/rules (upstream location
diff -Naur aleph-0.9.0/src/lib/odb/lib/Cell.cpp
aleph-0.9.0.nmu/src/lib/odb/lib/Cell.cpp
--- aleph-0.9.0/src/lib/odb/lib/Cell.cpp 2003-10-01 22:46:12.000000000
+0200
+++ aleph-0.9.0.nmu/src/lib/odb/lib/Cell.cpp 2005-08-05 19:39:51.230532456
+0200
@@ -104,7 +104,7 @@
const String& name = String::qmap (d_quark);
name.wrstream (os);
if (p_cobj == nilp)
- os.write (Serial::SERIAL_NILP_ID);
+ os.write ((char) Serial::SERIAL_NILP_ID);
else
p_cobj->serialize (os);
unlock ();
diff -Naur aleph-0.9.0/src/std/lib/Cons.cpp aleph-0.9.0.nmu/src/std/lib/Cons.cpp
--- aleph-0.9.0/src/std/lib/Cons.cpp 2003-10-01 22:46:08.000000000 +0200
+++ aleph-0.9.0.nmu/src/std/lib/Cons.cpp 2005-08-05 19:39:51.230532456
+0200
@@ -153,7 +153,7 @@
}
// try to serialize the car
if (p_car == nilp) {
- os.write (Serial::SERIAL_NILP_ID);
+ os.write ((char) Serial::SERIAL_NILP_ID);
} else {
Serial* sobj = dynamic_cast <Serial*> (p_car);
if (sobj == nilp) {
@@ -165,7 +165,7 @@
}
// try to serialize the cdr
if (p_cdr == nilp) {
- os.write (Serial::SERIAL_NILP_ID);
+ os.write ((char) Serial::SERIAL_NILP_ID);
} else {
Serial* sobj = dynamic_cast <Serial*> (p_cdr);
if (sobj == nilp) {
diff -Naur aleph-0.9.0/src/std/lib/Vector.cpp
aleph-0.9.0.nmu/src/std/lib/Vector.cpp
--- aleph-0.9.0/src/std/lib/Vector.cpp 2005-08-05 19:44:17.751015184 +0200
+++ aleph-0.9.0.nmu/src/std/lib/Vector.cpp 2005-08-05 19:39:51.230532456
+0200
@@ -134,7 +134,7 @@
for (long i = 0; i < d_length; i++) {
Object* obj = get (i);
if (obj == nilp) {
- os.write (Serial::SERIAL_NILP_ID);
+ os.write ((char) Serial::SERIAL_NILP_ID);
} else {
Serial* sobj = dynamic_cast <Serial*> (obj);
if (sobj == nilp) {
