[Pkg-haskell-commits] darcs: haskell-llvm: Use llvm-2.8 instead of llvm-2.7.

Erik de Castro Lopo erikd at mega-nerd.com
Mon May 9 22:14:48 UTC 2011 

Mon May  9 22:14:23 UTC 2011  Erik de Castro Lopo <erikd at mega-nerd.com>
  * Use llvm-2.8 instead of llvm-2.7.
  Ignore-this: 1e87ef40461324fe1ed415ec5250db04

    M ./changelog -2 +7
    M ./control -7 +6
    R ./libghc-llvm-doc.doc-base
    M ./patches/00-versioned-config.diff -9 +8

Mon May  9 22:14:23 UTC 2011  Erik de Castro Lopo <erikd at mega-nerd.com>
  * Use llvm-2.8 instead of llvm-2.7.
  Ignore-this: 1e87ef40461324fe1ed415ec5250db04
diff -rN -u old-haskell-llvm/changelog new-haskell-llvm/changelog
--- old-haskell-llvm/changelog	2011-05-09 22:14:48.176835303 +0000
+++ new-haskell-llvm/changelog	2011-05-09 22:14:48.184835727 +0000
@@ -1,8 +1,13 @@
-haskell-llvm (0.8.0.2-3) UNRELEASED; urgency=low
+haskell-llvm (0.8.0.2-3) unstable; urgency=low
 
+  [ Marco Silva ]
   * Use ghc instead of ghc6
 
- -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:17 -0200
+  [ Erik de Castro Lopo ]
+  * Compile against llvm-2.8 (Closes: #626206).
+  * Bump standards version (no changes required).
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com>  Tue, 10 May 2011 08:04:07 +1000
 
 haskell-llvm (0.8.0.2-2) unstable; urgency=low
 
diff -rN -u old-haskell-llvm/control new-haskell-llvm/control
--- old-haskell-llvm/control	2011-05-09 22:14:48.176835303 +0000
+++ new-haskell-llvm/control	2011-05-09 22:14:48.180835515 +0000
@@ -8,14 +8,13 @@
   , haskell-devscripts (>= 0.7)
   , ghc
   , ghc-prof
-  , llvm-2.7-dev
-  , llvm-2.7-source
+  , llvm-2.8-dev
   , libghc-mtl-dev
   , libghc-mtl-prof
   , libghc-type-level-dev
   , libghc-type-level-prof
 Build-Depends-Indep: ghc-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Homepage: http://hackage.haskell.org/package/llvm
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-llvm
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-llvm
@@ -25,7 +24,7 @@
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
   , ${misc:Depends}
-  , llvm-2.7-dev
+  , llvm-2.8-dev
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
@@ -35,14 +34,14 @@
  of CPU architectures. The Haskell bindings make it possible to use LLVM
  from Haskell.
  .
- This package contains the libraries compiled for GHC 6.
+ This package contains the libraries compiled for GHC.
 
 Package: libghc-llvm-prof
 Architecture: any
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
   , ${misc:Depends}
-  , llvm-2.7-dev
+  , llvm-2.8-dev
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
@@ -52,7 +51,7 @@
  of CPU architectures. The Haskell bindings make it possible to use LLVM
  from Haskell.
  .
- This package contains the profiling libraries compiled for GHC 6.
+ This package contains the profiling libraries compiled for GHC.
 
 Package: libghc-llvm-doc
 Section: doc
diff -rN -u old-haskell-llvm/libghc-llvm-doc.doc-base new-haskell-llvm/libghc-llvm-doc.doc-base
--- old-haskell-llvm/libghc-llvm-doc.doc-base	2011-05-09 22:14:48.176835303 +0000
+++ new-haskell-llvm/libghc-llvm-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Document: libghc-llvm-doc
-Title: Manual for the Haskell bindings to the LLVM compiler toolkit
-Abstract: Low Level Virtual Machine (LLVM) is a set of tools for use in the
- backend of a compiler for generating optimised native code across a wide
- variety of CPU architectures. The Haskell bindings make it possible to use
- LLVM from Haskell.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libghc-llvm-doc/html/doc-index.html
-Files: /usr/share/doc/libghc-llvm-doc/html/*.html
- /usr/share/doc/libghc-llvm-doc/html/src/*.html
diff -rN -u old-haskell-llvm/patches/00-versioned-config.diff new-haskell-llvm/patches/00-versioned-config.diff
--- old-haskell-llvm/patches/00-versioned-config.diff	2011-05-09 22:14:48.176835303 +0000
+++ new-haskell-llvm/patches/00-versioned-config.diff	2011-05-09 22:14:48.180835515 +0000
@@ -1,10 +1,9 @@
-Description: In debian, the llvm-config shell script for llvm-2.7 has been
- renamed to llvm-config-2.7. This patch fixes the configure script to use
- the debian version of the lvm-config script.
+Description: Since we're linking to llvm-2.8 specifically use the
+ llvm-config-2.8 config script.
  .
  This patch is a debian only thing and has not been forwarded upstream.
 Author: Erik de Castro Lopo <erikd at mega-nerd.com>
-Last-Update: 2010-05-21
+Last-Update: 2011-05-10
 
 Index: haskell-llvm-0.8.0.2/configure
 ===================================================================
@@ -12,21 +11,21 @@
 +++ haskell-llvm-0.8.0.2/configure
 @@ -2455,7 +2455,7 @@
  fi
- 
+
  # Extract the first word of "llvm-config", so it can be a program name with args.
 -set dummy llvm-config; ac_word=$2
-+set dummy llvm-config-2.7; ac_word=$2
++set dummy llvm-config-2.8; ac_word=$2
  { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_path_llvm_config+set}" = set; then
 @@ -2482,8 +2482,8 @@
  done
  IFS=$as_save_IFS
- 
+
 -  test -z "$ac_cv_path_llvm_config" && ac_cv_path_llvm_config="{ { $as_echo "$as_me:$LINENO: error: could not find llvm-config in $llvm_bindir" >&5
 -$as_echo "$as_me: error: could not find llvm-config in $llvm_bindir" >&2;}
-+  test -z "$ac_cv_path_llvm_config" && ac_cv_path_llvm_config="{ { $as_echo "$as_me:$LINENO: error: could not find llvm-config-2.7 in $llvm_bindir" >&5
-+$as_echo "$as_me: error: could not find llvm-config-2.7 in $llvm_bindir" >&2;}
++  test -z "$ac_cv_path_llvm_config" && ac_cv_path_llvm_config="{ { $as_echo "$as_me:$LINENO: error: could not find llvm-config-2.8 in $llvm_bindir" >&5
++$as_echo "$as_me: error: could not find llvm-config-2.8 in $llvm_bindir" >&2;}
     { (exit 1); exit 1; }; }"
    ;;
  esac

More information about the Pkg-haskell-commits mailing list