[Pkg-haskell-commits] r777 - in /packages/haskell-edison/trunk/debian: changelog control rules

Mon Oct 8 22:10:51 UTC 2007

Author: arjan
Date: Mon Oct  8 22:10:51 2007
New Revision: 777

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=777
Log:
 r2075 at nebula:  arjan | 2007-10-08 23:38:55 +0200
 * debian/control:
   - Use the new Homepage field.
   - gcc 4.2.0 and higher cause FTFBS if we enable --split-objs during
    the compilation of haskell-edison. As a workaround we disable
    --split-objs if the gcc version >= 4.2.0 (Closes: #445754)   

Modified:
    packages/haskell-edison/trunk/debian/changelog
    packages/haskell-edison/trunk/debian/control
    packages/haskell-edison/trunk/debian/rules

Modified: packages/haskell-edison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/changelog?rev=777&op=diff
==============================================================================

--- packages/haskell-edison/trunk/debian/changelog (original)
+++ packages/haskell-edison/trunk/debian/changelog Mon Oct  8 22:10:51 2007
@@ -1,9 +1,14 @@
 haskell-edison (1.2.1-5~pre1) unstable; urgency=low
 
+  * debian/control:
+    - Use the new Homepage field.
   * debian/rules: 
     - Make the determination of package names and versions more robust.
+    - gcc 4.2.0 and higher cause FTFBS if we enable --split-objs during
+     the compilation of haskell-edison. As a workaround we disable
+     --split-objs if the gcc version >= 4.2.0 (Closes: #445754)   
 
- -- Arjan Oosting <arjan at debian.org>  Fri, 22 Jun 2007 22:36:03 +0100
+ -- Arjan Oosting <arjan at debian.org>  Mon, 08 Oct 2007 18:50:35 +0200
 
 haskell-edison (1.2.1-4) unstable; urgency=low
 

Modified: packages/haskell-edison/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/control?rev=777&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/control (original)
+++ packages/haskell-edison/trunk/debian/control Mon Oct  8 22:10:51 2007
@@ -9,6 +9,7 @@
  libhugs-mtl | hugs (<< 98.200609.21), libhugs-quickcheck | hugs (<< 98.200609.21),
  libghc6-base-doc, libghc6-haskell98-doc, libghc6-mtl-doc, libghc6-quickcheck-doc
 Standards-Version: 3.7.2
+Homepage: http://www.eecs.tufts.edu/~rdocki01/edison.html
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-edison
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison
 
@@ -31,8 +32,6 @@
    - Multiple concrete implementations of each of the abstractions
  .
  This package contains the set of type classes.
- .
-  Homepage: http://www.eecs.tufts.edu/~rdocki01/edison.html
 
 Package: libghc6-edison-core-dev
 Architecture: any
@@ -53,8 +52,6 @@
    - Multiple concrete implementations of each of the abstractions
  .
  This package contains the concrete implementations.
- .
-  Homepage: http://www.eecs.tufts.edu/~rdocki01/edison.html
 
 Package: libhugs-edison-api
 Architecture: all
@@ -74,8 +71,6 @@
    - Multiple concrete implementations of each of the abstractions
  .
  This package contains the set of type classes.
- .
-  Homepage: http://www.eecs.tufts.edu/~rdocki01/edison.html
 
 Package: libhugs-edison-core
 Architecture: all
@@ -96,9 +91,6 @@
    - Multiple concrete implementations of each of the abstractions
  .
  This package contains the concrete implementations.
- .
-  Homepage: http://www.eecs.tufts.edu/~rdocki01/edison.html
-
 
 Package: haskell-edison-doc
 Architecture: all
@@ -116,5 +108,3 @@
      abstractions: 'sequences', 'collections' and 'associative
      collections'
    - Multiple concrete implementations of each of the abstractions
- .
-  Homepage: http://www.eecs.tufts.edu/~rdocki01/edison.html

Modified: packages/haskell-edison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/rules?rev=777&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/rules (original)
+++ packages/haskell-edison/trunk/debian/rules Mon Oct  8 22:10:51 2007
@@ -25,17 +25,22 @@
 GHC6_VERSION := $(shell ghc6 --numeric-version)
 GHC6_CONFIGURE_FLAGS := --prefix=/usr/lib/haskell-packages/ghc6 \
 	--enable-library-profiling 
+GHC6_OPTIONS :=
+
+CC_VERSION := $(shell gcc --version | head -n 1 | sed -e "s|\\([^1-9]\\)*\\([^ ]*\\).*|\\2|")
+CC_WORKAROUND := $(shell if dpkg --compare-versions $(CC_VERSION) ge 4.2.0 ; then echo true ; fi)
+
 # ghc -split-objs only works on i386 and amd64
 ifneq (,$(findstring $(DEB_HOST_ARCH),"i386 amd64"))
+ifeq (,$(findstring $(CC_WORKAROUND),"true"))
 GHC6_CONFIGURE_FLAGS += --enable-split-objs
+endif
 endif
 EDISON_DIRS  := edison-api edison-core
 
 # Handle DEB_BUILD_OPTIONS containing noopt
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-GHC6_OPTIONS=-O0
-else
-GHC6_OPTIONS=
+GHC6_OPTIONS+=-O0
 endif
 
 configure: configure-stamp
@@ -87,7 +92,7 @@
 	    ./setup configure $(GHC6_CONFIGURE_FLAGS) \
 		--with-compiler="$(CURDIR)/debian/ghc6" \
 		--with-hc-pkg="$(CURDIR)/debian/ghc-pkg6" && \
-	    GHC6_OPTIONS=$(GHC6_OPTIONS) ./setup build && \
+	    GHC6_OPTIONS="$(GHC6_OPTIONS)" ./setup build && \
 	    ./setup register --gen-script && \
 	    sed -i -e "s|import-dirs:.*|import-dirs: `pwd`/dist/build|" \
 		-e "s|library-dirs:.*|library-dirs: `pwd`/dist/build|" \


