[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-104-g0bdd7ff

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 14c7d1906d3a0c2f853befd39048b3a96b1e6e1c
Author: Carlo Wood <carlo at alinoe.com>
Date:   Sun Nov 2 17:14:27 2008 +0000

    Fix processing of CXXFLAGS/DEB_BUILD_OPTIONS

diff --git a/debian/rules b/debian/rules
index 07f4377..847bc52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,20 @@ export VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -O2
 
+# Process DEB_BUILD_OPTIONS.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	BUILDTYPE=releasenoopt
-else
-	BUILDTYPE=release
+  	# Strip existing -O* parameters. 
+	CXXFLAGS := $(CXXFLAGS:-O%=)
+else ifeq (,$(filter -O%,$(CXXFLAGS)))
+	# Add -O2 if no -O* already exists.
+	CXXFLAGS += -O2
 endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 
 DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 SLVIEWER_ARCH=$(subst amd64,x86_64,$(subst i386,i686,$(DEB_BUILD_ARCH)))
@@ -25,8 +32,7 @@ SLVIEWER_ARCH=$(subst amd64,x86_64,$(subst i386,i686,$(DEB_BUILD_ARCH)))
 #Architecture 
 build: build-arch build-indep
 
-build-arch: build-arch-stamp
-build-arch-stamp: patch
+configure: patch
 	dh_testdir
 	-mkdir -p indra/build
 	cd indra/build && \
@@ -38,8 +44,11 @@ build-arch-stamp: patch
 	-DCMAKE_INSTALL_PREFIX:STRING=debian/ \
 	-DBINARY_NAME:STRING=omvviewer \
 	-DOPENAL:BOOL=TRUE \
-	-DCMAKE_CXX_FLAGS:STRING="$(CFLAGS)" \
+	-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
 	..
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure
 	cd indra/build && $(MAKE)
 	touch $@
 

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids