[Pkg-haskell-commits] darcs: haskell-llvm: Can drop all patches (I hope)
Joachim Breitner
mail at joachim-breitner.de
Sat Mar 10 18:58:18 UTC 2012
Sat Mar 10 18:55:47 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Can drop all patches (I hope)
Ignore-this: 65d0eeb4dc1fcce629d03212718ae802
M ./changelog -2 +3
R ./patches/
R ./patches/00-versioned-config.diff
R ./patches/01-shared-llvm.diff
R ./patches/02-fix-linking-ld-no-add-needed.diff
R ./patches/series
Sat Mar 10 18:55:47 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Can drop all patches (I hope)
Ignore-this: 65d0eeb4dc1fcce629d03212718ae802
diff -rN -u old-haskell-llvm//changelog new-haskell-llvm//changelog
--- old-haskell-llvm//changelog 2012-03-10 18:58:17.738251198 +0000
+++ new-haskell-llvm//changelog 2012-03-10 18:58:17.754251414 +0000
@@ -1,8 +1,9 @@
-haskell-llvm (3.0.0.0-1) UNRELEASED; urgency=low
+haskell-llvm (3.0.0.0-1) unstable; urgency=low
* New upstream release (Closes: #662879)
+ * Can drop all patches (I hope)
- -- Joachim Breitner <nomeata at debian.org> Sat, 10 Mar 2012 19:50:43 +0100
+ -- Joachim Breitner <nomeata at debian.org> Sat, 10 Mar 2012 19:52:51 +0100
haskell-llvm (0.8.0.2-5) unstable; urgency=low
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 2012-03-10 18:58:17.754251414 +0000
+++ new-haskell-llvm//patches/00-versioned-config.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-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: 2011-05-10
-
-Index: haskell-llvm-0.8.0.2/configure
-===================================================================
---- haskell-llvm-0.8.0.2.orig/configure
-+++ 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.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.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
diff -rN -u old-haskell-llvm//patches/01-shared-llvm.diff new-haskell-llvm//patches/01-shared-llvm.diff
--- old-haskell-llvm//patches/01-shared-llvm.diff 2012-03-10 18:58:17.750247250 +0000
+++ new-haskell-llvm//patches/01-shared-llvm.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-Description: link with the shared LLVM-2.8 library
-Author: Matthias Klose <doko at ubuntu.com>
-Forwarded: yes, https://github.com/bos/llvm/pull/1
-
-Index: haskell-llvm-0.8.0.2/configure
-===================================================================
---- haskell-llvm-0.8.0.2.orig/configure 2011-01-30 13:05:53.000000000 +0100
-+++ haskell-llvm-0.8.0.2/configure 2011-01-30 13:13:11.000000000 +0100
-@@ -2528,7 +2528,7 @@
- llvm_includedir="`$llvm_config --includedir`"
- llvm_ldflags="`$llvm_config --ldflags`"
-
--llvm_all_libs="`$llvm_config --libs all`"
-+llvm_all_libs="-lLLVM-2.8"
- llvm_target="`$llvm_config --libs engine | sed 's/.*LLVM\(.[^ ]*\)CodeGen.*/\1/'`"
-
- CPPFLAGS="$llvm_cppflags $CPPFLAGS $TARGET_CPPFLAGS"
-Index: haskell-llvm-0.8.0.2/configure.ac
-===================================================================
---- haskell-llvm-0.8.0.2.orig/configure.ac 2011-01-30 13:13:39.000000000 +0100
-+++ haskell-llvm-0.8.0.2/configure.ac 2011-01-30 13:13:59.000000000 +0100
-@@ -72,7 +72,7 @@
- llvm_includedir="`$llvm_config --includedir`"
- llvm_ldflags="`$llvm_config --ldflags`"
-
--llvm_all_libs="`$llvm_config --libs all`"
-+llvm_all_libs="-lLLVM-2.8"
- llvm_target="`$llvm_config --libs engine | sed 's/.*LLVM\(.[[^ ]]*\)CodeGen.*/\1/'`"
-
- CPPFLAGS="$llvm_cppflags $CPPFLAGS $TARGET_CPPFLAGS"
diff -rN -u old-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff new-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff
--- old-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff 2012-03-10 18:58:17.750247250 +0000
+++ new-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-Description: Build with ld --as-needed
-Author: Matthias Klose <doko at ubuntu.com>
-Forwarded: yes, https://github.com/bos/llvm/pull/1
-
-Index: haskell-llvm/configure
-===================================================================
---- haskell-llvm.orig/configure 2011-05-28 09:39:00.248596000 +0100
-+++ haskell-llvm/configure 2011-05-28 09:39:45.202435000 +0100
-@@ -3996,7 +3996,7 @@
- done
-
-
--LIBS="-lLLVMSupport -lLLVMSystem $LIBS"
-+LIBS="-lLLVMSupport -lLLVMSystem -lpthread -ldl $LIBS"
-
- # We have to link using the C++ compiler.
- CC=$CXX
-Index: haskell-llvm/configure.ac
-===================================================================
---- haskell-llvm.orig/configure.ac 2011-05-28 09:39:00.248596000 +0100
-+++ haskell-llvm/configure.ac 2011-05-28 09:39:00.248596000 +0100
-@@ -81,7 +81,7 @@
- AC_CHECK_HEADERS([llvm-c/Core.h], [],
- [AC_MSG_ERROR(could not find LLVM C bindings)])
-
--LIBS="-lLLVMSupport -lLLVMSystem $LIBS"
-+LIBS="-lLLVMSupport -lLLVMSystem -lpthread -ldl $LIBS"
-
- # We have to link using the C++ compiler.
- CC=$CXX
diff -rN -u old-haskell-llvm//patches/series new-haskell-llvm//patches/series
--- old-haskell-llvm//patches/series 2012-03-10 18:58:17.750247250 +0000
+++ new-haskell-llvm//patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-00-versioned-config.diff
-01-shared-llvm.diff
-02-fix-linking-ld-no-add-needed.diff
More information about the Pkg-haskell-commits
mailing list