OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Sep-2005 16:40:47
Branch: HEAD Handle: 2005090715404600
Modified files:
openpkg-src/ghc ghc.spec
Log:
upgrade to Haskell 6.4
Summary:
Revision Changes Path
1.4 +23 -17 openpkg-src/ghc/ghc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ghc/ghc.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 ghc.spec
--- openpkg-src/ghc/ghc.spec 24 Mar 2005 11:18:54 -0000 1.3
+++ openpkg-src/ghc/ghc.spec 7 Sep 2005 14:40:46 -0000 1.4
@@ -23,9 +23,10 @@
##
# package version
-%define V_boot 6.2.2
-%define V_major 6.4
-%define V_minor 20050308
+%define V_source 6.4
+%define V_boot_bsd 6.4
+%define V_boot_lnx 6.4
+%define V_boot_sol 6.2.2
# package information
Name: ghc
@@ -37,14 +38,14 @@
Class: EVAL
Group: Language
License: X11-style
-Version: %{V_major}.%{V_minor}
-Release: 20050309
+Version: %{V_source}
+Release: 20050907
# list of sources
-Source0:
http://haskell.org/ghc/dist/stable/dist/ghc-%{version}-src.tar.bz2
-Source1:
http://haskell.org/ghc/dist/%{V_boot}/FreeBSD/ghc-%{V_boot}-i386-unknown-freebsd-boot.tar.bz2
-Source2:
http://haskell.org/ghc/dist/%{V_boot}/ghc-%{V_boot}-i386-linux-glibc2.2.tar.bz2
-Source3:
http://haskell.org/ghc/dist/%{V_boot}/ghc-%{V_boot}-sparc-sun-solaris2.tar.bz2
+Source0:
http://haskell.org/ghc/dist/%{V_source}/ghc-%{V_source}-src.tar.bz2
+Source1:
http://haskell.org/ghc/dist/%{V_boot_bsd}/FreeBSD/ghc-%{V_boot_bsd}-i386-unknown-freebsd5-boot.tar.bz2
+Source2:
http://haskell.org/ghc/dist/%{V_boot_lnx}/ghc-%{V_boot_lnx}-i386-unknown-linux.tar.bz2
+Source3:
http://haskell.org/ghc/dist/%{V_boot_sol}/ghc-%{V_boot_sol}-sparc-sun-solaris2.tar.bz2
Patch0: ghc.patch
# build information
@@ -68,9 +69,11 @@
%track
prog ghc = {
- version = %{version}
- url = http://haskell.org/ghc/dist/stable/dist/
- regex = ghc-(__VER__)\.tar\.bz2
+ version = %{V_source}
+ url = http://haskell.org/ghc/dist/
+ regex = (\d+\.\d+(\.\d+)?)
+ url = http://haskell.org/ghc/dist/__NEWVER__/
+ regex = ghc-(__VER__)-src\.tar\.bz2
}
%prep
@@ -98,29 +101,32 @@
else
# use the pre-built bootstrap distribution in-place
# and perform a full-featured stage 1 and stage 2 build
- ( cd ghc-%{V_boot}-boot
+ ( cd ghc-*-boot
./configure
%{l_make} %{l_mflags} in-place
+ rm -f bin/*/ghc-[0-9]*.sh
) || exit $?
- l_ghc="`pwd`/`echo ghc-%{V_boot}-boot/bin/*`/ghc-%{V_boot}"
+ l_ghc="`pwd`/`echo ghc-*-boot/bin/*/ghc-[0-9]*`"
m_target="bootstrap"
fi
+ # workaround build-time ~/.ghc/ storage
+ export HOME=`pwd`
+
# configure program
( echo "GhcLibWays="
+ echo "SplitObjs=NO"
) >>mk/build.mk
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
+ PerlCmd=%{l_prefix}/bin/perl \
./configure \
--prefix=%{l_prefix} \
--with-ghc="${l_ghc}" \
--with-gcc="%{l_cc}"
- # workaround build-time ~/.ghc/ storage
- export HOME=`pwd`
-
# build program
%{l_make} %{l_mflags} $m_target
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
