[pure] Update to 0.58
Michel Alexandre Salim
salimma at fedoraproject.org
Thu Jan 23 17:26:32 UTC 2014
commit 79e54a9e5c010e42ec396cb5adf5fbea163fbdf4
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Fri Jan 24 00:26:40 2014 +0700
Update to 0.58
.gitignore | 6 +-
pure-0.57-llvm-3.3.patch | 88 --------------------
...0.57-llvm-3.4.patch => pure-0.58-llvm-3.4.patch | 43 +++++++---
pure.spec | 35 +++++---
sources | 4 +-
5 files changed, 59 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88471f2..ecbc30d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/pure-0.55.tar.gz
-/pure-docs-0.55.tar.gz
-/pure-0.57.tar.gz
-/pure-docs-0.57.tar.gz
+/pure-0.58.tar.gz
+/pure-docs-0.58.tar.gz
diff --git a/pure-0.57-llvm-3.4.patch b/pure-0.58-llvm-3.4.patch
similarity index 62%
rename from pure-0.57-llvm-3.4.patch
rename to pure-0.58-llvm-3.4.patch
index e650385..0d1870a 100644
--- a/pure-0.57-llvm-3.4.patch
+++ b/pure-0.58-llvm-3.4.patch
@@ -1,16 +1,37 @@
-diff -up pure-0.57/configure.ac.llvm34 pure-0.57/configure.ac
---- pure-0.57/configure.ac 2014-01-15 10:36:48.000000000 +1000
-+++ pure-0.57/configure.ac 2014-01-15 10:36:48.000000000 +1000
-@@ -252,7 +252,7 @@ if test $fastcc = yes; then
+# HG changeset patch
+# User Albert Graef <aggraef at gmail.com>
+# Date 1389218251 -3600
+# Node ID 00f09b2a47d3a7811f767ab30f679ebb984084d7
+# Parent 1f5250e7d2e49f26186e3ad9afbae6387480660b
+# *** Updated by salimma at fedoraproject.org
+# *** to remove patch to INSTALL file
+# *** (doesn't apply to 0.58 tarball)
+LLVM 3.4 compatibility.
+
+diff --git a/pure/ChangeLog b/pure/ChangeLog
+--- a/pure/ChangeLog
++++ b/pure/ChangeLog
+@@ -1,3 +1,7 @@
++2014-01-08 Albert Graef <aggraef at gmail.com>
++
++ * configure.ac, interpreter.cc: Changes for LLVM 3.4 compatibility.
++
+ 2013-09-16 Albert Graef <aggraef at gmail.com>
+
+ * 0.58 release.
+diff --git a/pure/configure.ac b/pure/configure.ac
+--- a/pure/configure.ac
++++ b/pure/configure.ac
+@@ -263,7 +263,7 @@
fi
dnl Check for LLVM (try various LLVM versions).
--AC_CHECK_PROGS(LLVMCONF,[${llvm_config_pre} llvm-config-3.2 llvm-config-3.1 llvm-config-3.0 llvm-config-2.9 llvm-config-2.8 llvm-config-2.7 llvm-config-2.6 llvm-config-2.5],no,"$PATH:/")
+-AC_CHECK_PROGS(LLVMCONF,[${llvm_config_pre} llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config-3.0 llvm-config-2.9 llvm-config-2.8 llvm-config-2.7 llvm-config-2.6 llvm-config-2.5],no,"$PATH:/")
+AC_CHECK_PROGS(LLVMCONF,[${llvm_config_pre} llvm-config-3.4 llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config-3.0 llvm-config-2.9 llvm-config-2.8 llvm-config-2.7 llvm-config-2.6 llvm-config-2.5],no,"$PATH:/")
if test "$LLVMCONF" = no; then
AC_MSG_ERROR([Cannot find LLVM.])
fi
-@@ -345,6 +345,19 @@ AC_CACHE_CHECK([for new llvm::raw_fd_ost
+@@ -376,6 +376,19 @@
if test "$pure_cv_new_ostream" = yes; then
AC_DEFINE(NEW_OSTREAM, 1, [Define when building with new llvm::raw_fd_ostream interface (LLVM >= 2.7).])
fi
@@ -30,10 +51,10 @@ diff -up pure-0.57/configure.ac.llvm34 pure-0.57/configure.ac
else
AC_CACHE_CHECK([for new LLVM IRBuilder class (LLVM >= 2.4)], [pure_cv_new_builder],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-diff -up pure-0.57/interpreter.cc.llvm34 pure-0.57/interpreter.cc
---- pure-0.57/interpreter.cc 2014-01-15 10:36:48.000000000 +1000
-+++ pure-0.57/interpreter.cc 2014-01-15 10:36:48.000000000 +1000
-@@ -10189,6 +10189,9 @@ static string& quote(string& s)
+diff --git a/pure/interpreter.cc b/pure/interpreter.cc
+--- a/pure/interpreter.cc
++++ b/pure/interpreter.cc
+@@ -10240,6 +10240,9 @@
#define ostream_clear_error(os) os.clear()
#endif
@@ -43,7 +64,7 @@ diff -up pure-0.57/interpreter.cc.llvm34 pure-0.57/interpreter.cc
#if NEW_OSTREAM // LLVM >= 2.7 takes an enumeration as the last parameter
#define new_raw_fd_ostream(s,binary,msg) new llvm::raw_fd_ostream(s,msg,(binary)?llvm::raw_fd_ostream::F_Binary:0)
#else
-@@ -10198,6 +10201,7 @@ static string& quote(string& s)
+@@ -10249,6 +10252,7 @@
#define new_raw_fd_ostream(s,binary,msg) new llvm::raw_fd_ostream(s,binary,msg)
#endif
#endif
diff --git a/pure.spec b/pure.spec
index 78c3770..ce8f76e 100644
--- a/pure.spec
+++ b/pure.spec
@@ -1,6 +1,6 @@
Name: pure
-Version: 0.57
-Release: 7%{?dist}
+Version: 0.58
+Release: 1%{?dist}
Summary: A term-rewriting functional programming language
Group: Development/Languages
@@ -9,11 +9,11 @@ URL: http://purelang.bitbucket.org/
Source0: https://bitbucket.org/purelang/pure-lang/downloads/pure-%{version}.tar.gz
Source1: https://bitbucket.org/purelang/pure-lang/downloads/pure-docs-%{version}.tar.gz
Source2: pure-init.el
-Patch1: pure-0.57-libedit-history.patch
-Patch2: pure-0.57-llvm-3.3.patch
-Patch3: pure-0.57-llvm-3.4.patch
+# https://bitbucket.org/purelang/pure-lang/commits/00f09b2a47d3a7811f767ab30f679ebb984084d7
+Patch0: pure-0.58-llvm-3.4.patch
-BuildRequires: llvm-devel >= 3.4 flex bison
+BuildRequires: llvm-devel >= 3.3
+BuildRequires: flex bison
# note - disable for now; clang does not play well with GCC >= 4.7
# eg the tests seem to never finish
%if 0 && 0%{?fedora} >= 17
@@ -24,8 +24,8 @@ BuildRequires: libedit-devel
BuildRequires: mpfr-devel
# For compiling emacs mode
BuildRequires: emacs emacs-el
-BuildRequires: autoconf automake libtool
-BuildRequires: zlib-devel
+BuildRequires: autoconf automake libtool
+BuildRequires: zlib-devel
# For integrated help in the interpreter
Requires: w3m
@@ -89,9 +89,17 @@ This package contains the elisp source file for the Pure mode for Emacs.
%prep
%setup -q
cp -p %{SOURCE1} .
-%patch1 -p1 -b .orig
-%patch2 -p2 -b .llvm
-%patch3 -p1 -b .llvm34
+%if 0%{?fedora} >= 21
+%patch0 -p2 -b .llvm34
+%endif
+
+# fix file encodings
+for f in examples/texmacs/{latex-example.tm,dejavu.ts};
+do
+ iconv -f iso8859-1 -t utf-8 $f > $f.conv
+ touch -r $f $f.conv
+ mv -f $f.conv $f
+done
%build
@@ -113,7 +121,7 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-# trick the docs installation to go to %{_datadir} so it can be
+# trick the docs installation to go to %%{_datadir} so it can be
# shared among different arches
make install-docs DESTDIR=$RPM_BUILD_ROOT \
libdir=%{_datadir} docs=%{name}-docs-%{version}.tar.gz
@@ -177,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 23 2014 Michel Salim <salimma at fedoraproject.org> - 0.58-1
+- Update to 0.58
+
* Wed Jan 15 2014 Dave Airlie <airlied at redhat.com> 0.57-7
- fix build against (and require) llvm 3.4
diff --git a/sources b/sources
index 623debe..b8c671c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c32cd4a539474108389da66ee9d6c78f pure-0.57.tar.gz
-fef740d217eb060bb8cc57629905c9bd pure-docs-0.57.tar.gz
+167da298adbc17eeddf0bc781038abfb pure-0.58.tar.gz
+09e6887d243b0e2e4b5dca66752a11c0 pure-docs-0.58.tar.gz
More information about the scm-commits
mailing list