On 11/12/2007, Cyril Brulebois wrote: > Please find attached two patches to make osg 2.2 build with gcc 4.3. > Mostly some includes are needed. Some functions can't be static as I > understand it. And there's an extra typedef which doesn't seem to make > the build fail, but triggers many warnings while building, which is a > bit annoying; I've put this one in a separate patch for this reason.
Hi, forgot to mention that: I had to tweak debian/rules a bit, because currently CC is honoured, but not CXX. Two modifications: make CXX = g++ the default if not specified. Then get the full path from $(CXX) because cmake needs it (not in the first check, where CXX is checked as is CC), but some dozens of lines later). Patch attached. Cheers, -- Cyril Brulebois
--- a/openscenegraph-2.2.0/debian/rules 2007-12-11 13:02:32.000000000 +0100
+++ b/openscenegraph-2.2.0/debian/rules 2007-12-11 13:03:06.000000000 +0100
@@ -16,10 +16,13 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+# Default to g++
+CXX ?= g++
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
CCACHE = /usr/lib/ccache/g++
else
- CCACHE = /usr/bin/g++
+ # Full path to make ccache happy
+ CCACHE = $(shell which $(CXX))
endif
ifeq (smp,$(findstring smp,$(DEB_BUILD_OPTIONS)))
SMP = -j2
pgpofyulelbPG.pgp
Description: PGP signature
