Hi
This patch, apart from being much smaller, only uses g++-4.1 on arm
instead of both arm and armel (needs to use DEB_BUILD_ARCH, nit
DEB_BUILD_ARCH_CPU)
Thanks anyway, Peter, I copied your arch detection code, which is
much more elegant than my hacky attempt...
M
On arm (old-abi only) if you build with g++-4.2 or 4.3 the build segfaults the
first time it tries to run the interpreter.
MACHCONF is set to linux-arm on both arm and armel, so we invent another
config variable to distringuish between Debian arm and armel, and select
gcc-4.1 on arm only.
Martin Guy <[EMAIL PROTECTED]>, 31 July 2008
--- afnix-1.5.2.orig/debian/control 2008-07-31 21:28:16.000000000 +0100
+++ afnix-1.5.2/debian/control 2008-07-31 21:29:57.000000000 +0100
@@ -2,7 +2,7 @@
Section: interpreters
Priority: optional
Maintainer: Paul Cager <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.42), dpatch (>= 2.0),
+Build-Depends: debhelper (>= 5.0.42), dpatch (>= 2.0), g++-4.1 [arm],
libncurses5 (>= 5.5), libncurses5-dev (>= 5.5)
Standards-Version: 3.7.3
Homepage: http://www.afnix.org/
--- afnix-1.5.2.orig/cnf/mak/afnix-gcc-4.mak 2007-06-07 10:10:37.000000000 +0100
+++ afnix-1.5.2/cnf/mak/afnix-gcc-4.mak 2008-07-31 22:08:37.000000000 +0100
@@ -18,9 +18,17 @@
# - compiler and linker section -
# ----------------------------------------------------------------------------
+# On arm, only old-ABI, the build segfaults under g++-4.2 and 4.3.
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifeq ($(DEB_BUILD_ARCH),arm)
+CC = g++-4.1
+LD = gcc-4.1
+LK = gcc-4.1
+else
CC = g++
LD = gcc
LK = gcc
+endif
AR = ar
RANLIB = ranlib
STDEVFLAGS =
