packages: ghc-haskell-platform/ghc-haskell-platform.spec, ghc-haskell-platf...
baggins
baggins at pld-linux.org
Tue Sep 27 20:14:29 CEST 2011
Author: baggins Date: Tue Sep 27 18:14:29 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- trying to get it to build with ghc 7.2
---- Files affected:
packages/ghc-haskell-platform:
ghc-haskell-platform.spec (1.13 -> 1.14) , ghc-haskell-platform-ghc72.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ghc-haskell-platform/ghc-haskell-platform.spec
diff -u packages/ghc-haskell-platform/ghc-haskell-platform.spec:1.13 packages/ghc-haskell-platform/ghc-haskell-platform.spec:1.14
--- packages/ghc-haskell-platform/ghc-haskell-platform.spec:1.13 Tue Sep 27 15:13:21 2011
+++ packages/ghc-haskell-platform/ghc-haskell-platform.spec Tue Sep 27 20:14:23 2011
@@ -9,7 +9,11 @@
#Source0: http://hackage.haskell.org/platform/%{version}/%{pkgname}-%{version}.tar.gz
Source0: http://lambda.galois.com/hp-tmp/%{version}/%{pkgname}-%{version}.tar.gz
# Source0-md5: 97fd42f169a426d043368cec342745ef
+# TEMP
+Source100: http://hackage.haskell.org/packages/archive/syb/0.3.3/syb-0.3.3.tar.gz
+# Source100-md5: 4bc2ef44a86c9182f9768c6cc0a96c3a
Patch0: %{name}-install.patch
+Patch1: %{name}-ghc72.patch
URL: http://hackage.haskell.org/platform/
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-GLU-devel
@@ -65,15 +69,21 @@
They should be installed when GHC's profiling subsystem is needed.
%prep
-%setup -q -n %{pkgname}-%{version}
+%setup -q -n %{pkgname}-%{version} -a100
%patch0 -p1
+%patch1 -p1
+
+%{__rm} -r packages/syb-0.3
+mv syb-0.3.3 packages/
+%{__sed} -i -e 's|syb-0.3|syb-0.3.3|g' packages/platform.packages
%build
+
%configure \
--enable-unsupported-ghc-version
-%{__make} VERBOSE="-v2" \
- EXTRA_CONFIGURE_OPTS="-v2 \
+%{__make} VERBOSE="-v3" \
+ EXTRA_CONFIGURE_OPTS="-v3 \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \
@@ -388,6 +398,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2011/09/27 18:14:23 baggins
+- trying to get it to build with ghc 7.2
+
Revision 1.13 2011/09/27 13:13:21 baggins
- --enable-unsupported-ghc-version
================================================================
Index: packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch
diff -u /dev/null packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch:1.1
--- /dev/null Tue Sep 27 20:14:29 2011
+++ packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch Tue Sep 27 20:14:23 2011
@@ -0,0 +1,32 @@
+--- a/packages/alex-2.3.5/alex.cabal
++++ b/packages/alex-2.3.5/alex.cabal
+@@ -72,7 +72,7 @@ executable alex
+
+ build-depends: base < 5
+
+- extensions: CPP
++ extensions: CPP, BangPatterns
+ ghc-options: -Wall
+ other-modules:
+ AbsSyn
+--- a/packages/alex-2.3.5/doc/configure.ac
++++ b/packages/alex-2.3.5/doc/configure.ac
+@@ -9,5 +9,5 @@ FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/
+
+ AC_PATH_PROG(DbLatexCmd,dblatex)
+
+-AC_CONFIG_FILES([config.mk])
++AC_CONFIG_FILES([config.mk alex.1])
+ AC_OUTPUT
+--- haskell-platform-2011.2.0.1/packages/haskell-src-1.0.1.4/haskell-src.cabal~ 2011-04-03 23:23:56.000000000 +0200
++++ haskell-platform-2011.2.0.1/packages/haskell-src-1.0.1.4/haskell-src.cabal 2011-09-27 20:12:10.939000793 +0200
+@@ -32,8 +32,7 @@
+ if flag(split-base)
+ build-depends: base >= 4 && < 5, syb, pretty, array
+ else
+- build-depends: base < 3
+- build-depends: haskell98
++ build-depends: base < 3, haskell98
+ -- The dependency on Haskell 98 is only because
+ -- Happy generates a parser that imports Array
+ extensions: CPP
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskell-platform/ghc-haskell-platform.spec?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list