OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 03-May-2009 11:43:10
Branch: HEAD Handle: 2009050310431000
Modified files:
openpkg-src/ghc ghc.patch ghc.spec
Log:
upgrading package: ghc 6.6.1 -> 6.10.2
Summary:
Revision Changes Path
1.4 +9 -23 openpkg-src/ghc/ghc.patch
1.18 +20 -11 openpkg-src/ghc/ghc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ghc/ghc.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 ghc.patch
--- openpkg-src/ghc/ghc.patch 14 Aug 2008 18:10:46 -0000 1.3
+++ openpkg-src/ghc/ghc.patch 3 May 2009 09:43:10 -0000 1.4
@@ -1,26 +1,12 @@
Index: mk/config.mk.in
---- mk/config.mk.in.orig 2006-10-10 21:03:51 +0200
-+++ mk/config.mk.in 2006-10-11 17:58:33 +0200
-@@ -512,8 +512,8 @@
- # Unix: override libdir and datadir to put ghc-specific stuff in
- # a subdirectory with the version number included.
+--- mk/config.mk.in.orig 2009-03-30 19:13:16 +0200
++++ mk/config.mk.in 2009-05-03 10:07:45 +0200
+@@ -625,7 +625,7 @@
+ # where package.conf is, so we just set it globally).
#
--libdir = $(libdir0)/ghc-$(ProjectVersion)
--datadir = $(datadir0)/ghc-$(ProjectVersion)
-+libdir = $(libdir0)/ghc
-+datadir = $(datadir0)/ghc
+ datarootdir := $(datadir0)
+-libdir := $(libdir0)/ghc-$(ProjectVersion)
++libdir := $(libdir0)/ghc
+ datadir := $(libdir)
- endif # Windows
-
-Index: configure
---- configure.orig 2007-04-24 02:27:26 +0200
-+++ configure 2008-06-08 00:07:41 +0200
-@@ -2590,7 +2590,7 @@
- exit 1
- else
- $PerlCmd -v >conftest.out 2>&1
-- if grep "v5.6" conftest.out >/dev/null 2>&1; then
-+ if grep "v5.10" conftest.out >/dev/null 2>&1; then
- :
- else
- if grep "v5.8" conftest.out >/dev/null 2>&1; then
+ # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ghc/ghc.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 ghc.spec
--- openpkg-src/ghc/ghc.spec 18 Apr 2009 13:10:40 -0000 1.17
+++ openpkg-src/ghc/ghc.spec 3 May 2009 09:43:10 -0000 1.18
@@ -22,10 +22,10 @@
##
# package version
-%define V_source 6.6.1
-%define V_boot_bsd 6.6
-%define V_boot_lnx 6.6
-%define V_boot_sol 6.6
+%define V_source 6.10.2
+%define V_boot_bsd 6.8.3
+%define V_boot_lnx 6.10.2
+%define V_boot_sol 6.10.2
# package information
Name: ghc
@@ -38,14 +38,14 @@
Group: Language
License: X11-style
Version: %{V_source}
-Release: 20080814
+Release: 20090503
# list of sources
Source0:
http://haskell.org/ghc/dist/%{V_source}/ghc-%{V_source}-src.tar.bz2
Source1:
http://haskell.org/ghc/dist/%{V_source}/ghc-%{V_source}-src-extralibs.tar.bz2
Source2:
http://haskell.org/ghc/dist/%{V_boot_bsd}/FreeBSD/ghc-%{V_boot_bsd}-i386-unknown-freebsd6-boot.tar.bz2
Source3:
http://haskell.org/ghc/dist/%{V_boot_lnx}/ghc-%{V_boot_lnx}-i386-unknown-linux.tar.bz2
-Source4:
http://haskell.org/ghc/dist/%{V_boot_sol}/ghc-%{V_boot_sol}-sparc-sun-solaris2.tar.bz2
+Source4:
http://haskell.org/ghc/dist/%{V_boot_sol}/maeder/ghc-%{V_boot_sol}-sparc-sun-solaris2.tar.bz2
Patch0: ghc.patch
# build information
@@ -53,6 +53,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, perl, make
PreReq: OpenPKG, openpkg >= 20040130, gcc
+BuildPreReq: gmp
+PreReq: gmp
AutoReq: no
AutoReqProv: no
@@ -122,13 +124,15 @@
else
# use the pre-built bootstrap distribution in-place
# and perform a full-featured stage 1 and stage 2 build
+ l_boot="`pwd`/ghc-boot"
( cd ghc-*-boot
- ./configure
- %{l_make} %{l_mflags} in-place
- rm -f bin/*/ghc-[0-9]*.sh
+ ./configure --prefix="$l_boot"
+ %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags} install
) || exit $?
- l_ghc="`pwd`/`echo ghc-*-boot/bin/*/ghc-[0-9]*`"
+ l_ghc="$l_boot/bin/ghc"
m_target="bootstrap"
+ PATH="$l_boot/bin:$PATH"
fi
# workaround build-time ~/.ghc/ storage
@@ -146,7 +150,9 @@
./configure \
--prefix=%{l_prefix} \
--with-ghc="${l_ghc}" \
- --with-gcc="%{l_cc}"
+ --with-gcc="%{l_cc}" \
+ --with-gmp-includes=%{l_prefix}/include \
+ --with-gmp-libraries=%{l_prefix}/lib
# build program
%{l_make} %{l_mflags} $m_target
@@ -160,6 +166,8 @@
else
# install the stage 2
m_target="install"
+ l_boot="`pwd`/ghc-boot"
+ PATH="$l_boot/bin:$PATH"
fi
%{l_make} %{l_mflags} $m_target \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
@@ -172,6 +180,7 @@
$RPM_BUILD_ROOT%{l_prefix}/bin/$prog
done
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
