[pkg-fgfs-crew] r189 - in /flightgear/trunk/debian: changelog rules

[ovek at users.alioth.debian.org]

Author: ovek
Date: Sun Sep  4 17:05:01 2011
New Revision: 189

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=189
Log:
Removed an old hack to work around an old gcc bug.

Modified:
    flightgear/trunk/debian/changelog
    flightgear/trunk/debian/rules

Modified: flightgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/changelog?rev=189&op=diff
==============================================================================
--- flightgear/trunk/debian/changelog (original)
+++ flightgear/trunk/debian/changelog Sun Sep  4 17:05:01 2011
@@ -3,6 +3,9 @@
   * New upstream release. Closes: #638588.
   * Build-Depend on OpenSceneGraph 3.0, and the Subversion library.
   * Recommend fgfs-scenery-base.
+  * Enable parallel builds (shorter compile times on multicore CPUs).
+  * Removed hack that tried to build without optimizations if
+    building with optimizations fails.
 
  -- Ove Kaaven <ovek at arcticnet.no>  Sat, 03 Sep 2011 22:16:12 +0200
 

Modified: flightgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/rules?rev=189&op=diff
==============================================================================
--- flightgear/trunk/debian/rules (original)
+++ flightgear/trunk/debian/rules Sun Sep  4 17:05:01 2011
@@ -18,6 +18,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 		    --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \
 		    --with-simgear=/usr --with-multiplayer --with-threads
@@ -27,10 +28,8 @@
 build-stamp: configure-stamp
 	dh_testdir
 
-	# try standard build options first; if that fails,
-	# clean up and then try again without optimization
-	$(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" || \
-	$(MAKE) clean && $(MAKE) CFLAGS="" CXXFLAGS=""
+	$(MAKE)
+
 	#/usr/bin/docbook-to-man debian/flightgear.sgml > flightgear.1
 
 	touch build-stamp