Re: galeon needs to get into woody
On Sun, Feb 17, 2002 at 12:52:16AM -0800, Ryan Murray wrote:
> On Sat, Feb 16, 2002 at 04:56:28PM -0500, Colin Walters wrote:
> > Since aj has said we're going to be releasing soon, please, let's do
> > everything we can to get galeon into woody. At this point, I think this
> > means no more uploads of galeon and its dependencies for 8 days.
>
> It means someone needs to resolve the ia64 build failure -- no symbols
> from the mozilla libs appear to exist. I'm not sure if anyone is working
> on this as of yet....
This is because the mozilla libraries are built with g++-3.0 on IA64, and
the g++ name mangling has changed in version 3. Here's a patch which
likewise uses g++-3.0 for galeon on IA64.
(N.B. I've modified configure as well as configure.in since the configure
script is from upstream and there is some pre-existing autoconf brokenness
with the package. touch configure; touch aclocal.m4 is necessary after
applying to prevent stuff getting rebuilt.)
Matt
diff -ur galeon-1.0.3.old/configure galeon-1.0.3/configure
--- galeon-1.0.3.old/configure Tue Feb 5 10:48:02 2002
+++ galeon-1.0.3/configure Mon Feb 18 17:57:30 2002
@@ -10312,7 +10312,7 @@
fi
if test "x$GCC" = "xyes"; then
- VER=`gcc --version`
+ VER=`$CC --version`
echo "$as_me:$LINENO: checking for gcc version" >&5
echo $ECHO_N "checking for gcc version... $ECHO_C" >&6
@@ -10589,7 +10589,7 @@
_mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_libs"
-CC="g++"
+CC="$CXX"
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lxpcom"
echo "$as_me:$LINENO: checking for xpcom" >&5
@@ -10775,7 +10775,7 @@
echo "$as_me:$LINENO: checking for Mozilla" >&5
echo $ECHO_N "checking for Mozilla... $ECHO_C" >&6
-CC="g++"
+CC="$CXX"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
diff -ur galeon-1.0.3.old/configure.in galeon-1.0.3/configure.in
--- galeon-1.0.3.old/configure.in Tue Feb 5 10:47:33 2002
+++ galeon-1.0.3/configure.in Mon Feb 18 17:57:30 2002
@@ -373,7 +373,7 @@
dnl Test gcc version
if test "x$GCC" = "xyes"; then
- VER=`gcc --version`
+ VER=`$CC --version`
AC_MSG_CHECKING(for gcc version)
GALEON_PARSE_VERSION("",$VER,GCC_VERSION)
GALEON_VERSION_RESULT($GCC_VERSION)
@@ -459,7 +459,7 @@
_mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_libs"
dnl Now check for the evil c++ ones "by hand"
-CC="g++"
+CC="$CXX"
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lxpcom"
AC_MSG_CHECKING(for xpcom)
@@ -495,7 +495,7 @@
dnl Now make sure all the libraries are good
AC_MSG_CHECKING(for Mozilla)
-CC="g++"
+CC="$CXX"
dnl hacky check for the g++ headers location
AC_TRY_COMPILE([#include <g++/string>]
[],
diff -ur galeon-1.0.3.old/debian/control galeon-1.0.3/debian/control
--- galeon-1.0.3.old/debian/control Mon Feb 18 16:49:02 2002
+++ galeon-1.0.3/debian/control Mon Feb 18 17:58:25 2002
@@ -2,7 +2,7 @@
Section: non-US/main
Priority: optional
Maintainer: Jared Johnson (Debian) <solomon@futureks.net>
-Build-Depends: debhelper (>> 3.0.0), mozilla-dev (>=2:0.9.8), libgnome-dev (>=1.2.0), liborbit-dev (>=0.4.0), libgnome-vfs-dev (>=1.0.3-2), libgdk-pixbuf-dev (>=0.10.0), libgdk-pixbuf-gnome-dev (>=0.10.0), libxml-dev (>=1.8.14), libglade-gnome0-dev (>=0.13), libgconf-dev (>=1.0.4), liboaf-dev (>=0.6.2), libwrap0-dev, intltool, sharutils, scrollkeeper
+Build-Depends: debhelper (>> 3.0.0), mozilla-dev (>=2:0.9.8), libgnome-dev (>=1.2.0), liborbit-dev (>=0.4.0), libgnome-vfs-dev (>=1.0.3-2), libgdk-pixbuf-dev (>=0.10.0), libgdk-pixbuf-gnome-dev (>=0.10.0), libxml-dev (>=1.8.14), libglade-gnome0-dev (>=0.13), libgconf-dev (>=1.0.4), liboaf-dev (>=0.6.2), libwrap0-dev, intltool, sharutils, scrollkeeper, g++-3.0 [ia64]
Build-Conflicts: mozilla-dev (>=2:0.9.9)
Standards-Version: 3.5.2
diff -ur galeon-1.0.3.old/debian/rules galeon-1.0.3/debian/rules
--- galeon-1.0.3.old/debian/rules Mon Feb 18 16:49:02 2002
+++ galeon-1.0.3/debian/rules Mon Feb 18 17:57:30 2002
@@ -22,8 +22,10 @@
ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
ifeq ($(ARCH),alpha)
COMPILER_FLAGS=CFLAGS="-g -O2 -mieee" CXXFLAGS="-g -O2 -mieee"
-else
-COMPILER_FLAGS=
+endif
+ifeq ($(ARCH),ia64)
+# mozilla is built with g++-3.0 on IA64, so galeon must do the same
+COMPILER_FLAGS=CC=gcc-3.0 CXX=g++-3.0
endif
CONFFLAGS=\
Reply to: