[SCM] Multiplatform 3D Game Development Kit branch, master, updated. debian/1.2.1-1-2-gc470cc5

[Gonéri Le Bouder]

The following commit has been merged in the master branch:
commit c470cc55a9bc605878861886a0d30c7ba944ea5e
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Wed Jul 8 00:01:37 2009 +0200

    do not use config.mak anymore
    
    * Drop --enable-new-renderer since it doesn't exist anymore
    * Pass CFLAGS as a env var, config.mak is not sourced anymore during the
       build (Closes: #524764)

diff --git a/debian/changelog b/debian/changelog
index 41d5014..4dc6baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 crystalspace (1.2.1-1.1) unstable; urgency=low
 
-  * Build-depends on libode-dev instead of libode0-dev
+  * Build-depends on libode-dev instead of libode0-dev (Closes: #520729)
   * Unfold the Build-Depends: field
   * Add myself in upload
+  * Drop --enable-new-renderer since it doesn't exist anymore
+  * Pass CFLAGS as a env var, config.mak is not sourced anymore during the
+    build (Closes: #524764)
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 07 Jun 2009 17:03:06 +0200
 
diff --git a/debian/rules b/debian/rules
index 8afc787..29bdc41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,8 @@ VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//')
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g
+# Force -fPIC as compiling/linking option
+CFLAGS = -Wall -g -fPIC
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -42,12 +43,30 @@ endif
 ifeq ($(DEB_HOST_ARCH),amd64)
 	CONFFLAG = --without-lib3ds --without-libode
 endif
-NEWRENDERER = --enable-new-renderer
 #PYTHON = --without-python
 CPUOPTIM = --enable-cpu-specific-optimizations=no
 CONFDIR = --prefix=/usr --sysconfdir=/etc
 JAVA = --without-java
 
+# Add here commands to compile the package.
+# For arm, powerpc, s390 and SPARC
+ifeq ($(DEB_HOST_ARCH),arm)
+	CFLAGS += -fsigned-char 
+endif
+ifeq ($(DEB_HOST_ARCH),powerpc)
+	CFLAGS += -fsigned-char 
+endif
+ifeq ($(DEB_HOST_ARCH),s390)
+	CFLAGS += -fsigned-char 
+endif
+ifeq ($(DEB_HOST_ARCH),hppa)
+	CFLAGS += -fsigned-char 
+endif
+ifeq ($(DEB_HOST_ARCH),sparc)
+	CFLAGS += -Wa,-xarch=v8plus
+endif
+export CXXFLAGS = $(CFLAGS)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -79,7 +98,7 @@ endif
 	# Don't support until this is dynamic lib
 	# --enable-meta-info-embedding was by default before (enbed .csplugin info)
 	perl -pi -e "s:\[crystal\]:\[crystalspace\]:" $(CURDIR)/CS/configure.ac
-	cd CS; ./bin/autogen.sh ; cs_cv_prog_cxx_local_include=no ./configure $(CONFDIR) $(CPUOPTIM) $(PYTHON) $(NEWRENDERER) $(CONFFLAG) $(JAVA)
+	cd CS; ./bin/autogen.sh ; cs_cv_prog_cxx_local_include=no ./configure $(CONFDIR) $(CPUOPTIM) $(PYTHON) $(CONFFLAG) $(JAVA)
 
 	# Install as much as possible
 	#perl -pi -e "s/#TO_INSTALL/TO_INSTALL/" $(CURDIR)/CS/cache.mak
@@ -98,20 +117,7 @@ build: build-arch build-indep
 build-arch: build-arch-stamp
 build-arch-stamp: patch configure-stamp
 
-	# Add here commands to compile the package.
-	# For arm, powerpc, s390
-ifeq ($(DEB_HOST_ARCH),arm)
-	echo "CFLAGS.SYSTEM += -fsigned-char"  >> $(CURDIR)/CS/config.mak 
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
-	echo "CFLAGS.SYSTEM += -fsigned-char"  >> $(CURDIR)/CS/config.mak 
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
-	echo "CFLAGS.SYSTEM += -fsigned-char"  >> $(CURDIR)/CS/config.mak 
-endif
-ifeq ($(DEB_HOST_ARCH),hppa)
-	echo "CFLAGS.SYSTEM += -fsigned-char"  >> $(CURDIR)/CS/config.mak 
-endif
+
 
 	# Compile static libs without -fPIC (except for ia64, amd64, hppa and alpha)
 #ifneq ($(DEB_HOST_ARCH),amd64)
@@ -122,11 +128,6 @@ endif
 #endif
 #endif
 #endif
-	# Force -fPIC as compiling/linking option
-	echo "CFLAGS.SYSTEM += -fPIC"  >> $(CURDIR)/CS/config.mak 
-	echo "LFLAGS.EXE += -fPIC"  >> $(CURDIR)/CS/config.mak 
-	echo "LFLAGS.DLL += -fPIC"  >> $(CURDIR)/CS/config.mak 
-	echo "LIBS.EXE += -fPIC"  >> $(CURDIR)/CS/config.mak 
 	# Make dynamic version of libs
 	# not yet usable
 	#cd $(CURDIR)/CS; $(MAKE) libs USE_SHARED_LIBS=yes

-- 
Multiplatform 3D Game Development Kit