packages: ghc/ghc-pkgdir.patch, ghc/ghc-pld.patch, ghc/ghc.spec - updated t...

baggins baggins at pld-linux.org
Mon Sep 26 11:59:01 CEST 2011 

Author: baggins                      Date: Mon Sep 26 09:59:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 7.2.1

---- Files affected:
packages/ghc:
   ghc-pkgdir.patch (1.1 -> 1.2) , ghc-pld.patch (1.10 -> 1.11) , ghc.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: packages/ghc/ghc-pkgdir.patch
diff -u packages/ghc/ghc-pkgdir.patch:1.1 packages/ghc/ghc-pkgdir.patch:1.2
--- packages/ghc/ghc-pkgdir.patch:1.1	Thu Aug 26 21:32:55 2010
+++ packages/ghc/ghc-pkgdir.patch	Mon Sep 26 11:58:55 2011
@@ -1,5 +1,5 @@
---- ghc-6.12.3/libraries/Cabal/Distribution/Simple/InstallDirs.hs~	2010-06-09 20:10:19.000000000 +0200
-+++ ghc-6.12.3/libraries/Cabal/Distribution/Simple/InstallDirs.hs	2010-08-26 21:28:52.969002660 +0200
+--- ghc-6.12.3/libraries/Cabal/cabal/Distribution/Simple/InstallDirs.hs~	2010-06-09 20:10:19.000000000 +0200
++++ ghc-6.12.3/libraries/Cabal/cabal/Distribution/Simple/InstallDirs.hs	2010-08-26 21:28:52.969002660 +0200
 @@ -205,7 +205,7 @@
  -- users to be able to configure @--libdir=\/usr\/lib64@ for example but
  -- because by default we want to support installing multiple versions of
@@ -10,9 +10,9 @@
  -- An additional complication is the need to support relocatable packages on
  -- systems which support such things, like Windows.
 @@ -236,7 +236,7 @@
-            Hugs   -> "hugs" </> "packages" </> "$pkg"
             JHC    -> "$compiler"
             LHC    -> "$compiler"
+            UHC    -> "$pkgid"
 -           _other -> "$pkgid" </> "$compiler",
 +           _other -> "$compiler" </> "$pkgid",
        dynlibdir    = "$libdir",

================================================================
Index: packages/ghc/ghc-pld.patch
diff -u packages/ghc/ghc-pld.patch:1.10 packages/ghc/ghc-pld.patch:1.11
--- packages/ghc/ghc-pld.patch:1.10	Fri Aug 27 12:50:30 2010
+++ packages/ghc/ghc-pld.patch	Mon Sep 26 11:58:55 2011
@@ -30,88 +30,14 @@
  TERMINFO_LIB_DIRS=
  if test "x$curses_libraries" != "xNONE"; then
    LDFLAGS="-L$curses_libraries $LDFLAGS"
---- ghc-6.12.1/driver/mangler/ghc-asm.lprl.orig	2009-12-10 19:11:33.000000000 +0100
-+++ ghc-6.12.1/driver/mangler/ghc-asm.lprl	2010-04-08 17:18:20.029978739 +0200
-@@ -65,7 +65,7 @@
- $ifile = $ARGV[0];
- $ofile = $ARGV[1];
- 
--if ( $TargetPlatform =~ /^i386-/m ) {
-+if ( $TargetPlatform =~ /^i[3456]86-/m ) {
-     if ($ARGV[2] eq '') {
- 	$StolenX86Regs = 4;
-     } else {
-@@ -134,7 +134,7 @@
-     $T_HDR_vector   = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n";
- 
-     #--------------------------------------------------------#
--    } elsif ( $TargetPlatform =~ /^i386-.*-(linuxaout|freebsd2|nextstep3|cygwin32|mingw32)$/m ) {
-+    } elsif ( $TargetPlatform =~ /^i[3456]86-.*-(linuxaout|freebsd2|nextstep3|cygwin32|mingw32)$/m ) {
- 				# NeXT added but not tested. CaS
- 
-     $T_STABBY	    = 1; # 1 iff .stab things (usually if a.out format)
-@@ -160,7 +160,7 @@
-     $T_HDR_vector   = "\.text\n\t\.align 4\n"; # NB: requires padding
- 
-     #--------------------------------------------------------#
--    } elsif ( $TargetPlatform =~ /^i386-.*-(solaris2|linux|gnu|freebsd|dragonfly|netbsd|openbsd|kfreebsdgnu)$/m ) {
-+    } elsif ( $TargetPlatform =~ /^i[3456]86-.*-(solaris2|linux|gnu|freebsd|dragonfly|netbsd|openbsd|kfreebsdgnu)$/m ) {
- 
-     $T_STABBY	    = 0; # 1 iff .stab things (usually if a.out format)
-     $T_US	    = ''; # _ if symbols have an underscore on the front
-@@ -512,7 +512,7 @@
- print STDERR "T_PRE_APP: $T_PRE_APP\n";
- print STDERR "T_CONST_LBL: $T_CONST_LBL\n";
- print STDERR "T_POST_LBL: $T_POST_LBL\n";
--if ( $TargetPlatform =~ /^i386-/m ) {
-+if ( $TargetPlatform =~ /^i[3456]86-/m ) {
-     print STDERR "T_X86_PRE_LLBL_PAT: $T_X86_PRE_LLBL_PAT\n";
-     print STDERR "T_X86_PRE_LLBL: $T_X86_PRE_LLBL\n";
-     print STDERR "T_X86_BADJMP: $T_X86_BADJMP\n";
-@@ -871,7 +871,7 @@
- 		$p =~ s/\t+$//m;
- 		$r =~ s/^\s*\n//m;
- 
--		if ($TargetPlatform =~ /^i386-/m) {
-+		if ($TargetPlatform =~ /^i[3456]86-/m) {
- 		    if ($p =~ /^\tsubl\s+\$(\d+),\s*\%esp\n/m) {
- 			if ($1 >= 8192) {
- 			    die "Error: reserved stack space exceeded!\n  Possible workarounds: compile with -fasm, or try another version of gcc.\n"
-@@ -1101,7 +1101,7 @@
-                 # etail holds code that is after the epilogue in the assembly-code
-                 # layout and should not be filtered as part of the epilogue.
-                 $etail = "";
--		if ($TargetPlatform =~ /^i386-/m) {
-+		if ($TargetPlatform =~ /^i[3456]86-/m) {
- 		    $e =~ s/^\tret\n//m;
- 		    $e =~ s/^\tpopl\s+\%edi\n//m;
- 		    $e =~ s/^\tpopl\s+\%esi\n//m;
-@@ -1253,7 +1253,7 @@
- 	    #    blah_closure:
- 	    #		...
-             #
--	    if ( $TargetPlatform =~ /^(i386|sparc|powerpc)/m && $to_move =~ /${T_COPY_DIRVS}/m ) {
-+	    if ( $TargetPlatform =~ /^(i[3456]86|sparc|powerpc)/m && $to_move =~ /${T_COPY_DIRVS}/m ) {
- 		$j = $i + 1;
- 		while ( $j < $numchks  && $chk[$j] =~ /$T_CONST_LBL/m) {
- 			$j++;
-@@ -1714,7 +1714,7 @@
- 	    s/^\tmovl\s+\$${T_US}(.*),\s*(\%e(ax|cx|si|di))\n\tjmp\s+\*\%r\3/\tjmp\t$T_US$1/gm;
-     }
- 
--    if ( $TargetPlatform !~ /^i386-/m 
-+    if ( $TargetPlatform !~ /^i[3456]86-/m 
-       || ! /^\t[a-z]/m  # no instructions in here, apparently
-       || /^${T_US}__stginit_[A-Za-z0-9_]+${T_POST_LBL}/m) {
- 	print OUTASM $_;
---- ghc-6.12.3/aclocal.m4~	2010-06-09 20:10:08.000000000 +0200
-+++ ghc-6.12.3/aclocal.m4	2010-08-20 21:23:11.218919505 +0200
-@@ -1279,7 +1279,7 @@
-   hppa*)
-     $2="hppa"
-     ;;
--  i386)
-+  i386|i486|i586|i686)
-     $2="i386"
-     ;;
-   ia64)
+--- ghc-7.2.1/driver/split/ghc-split.lprl~	2011-08-07 19:10:05.000000000 +0200
++++ ghc-7.2.1/driver/split/ghc-split.lprl	2011-09-26 11:13:36.907176266 +0200
+@@ -225,7 +225,7 @@
+                             if $TargetPlatform =~ /-apple-darwin/m;
+     return(&process_asm_block_m68k($str))  if $TargetPlatform =~ /^m68k-/m;
+     return(&process_asm_block_sparc($str)) if $TargetPlatform =~ /^sparc-/m;
+-    return(&process_asm_block_iX86($str))  if $TargetPlatform =~ /^i[34]86-/m;
++    return(&process_asm_block_iX86($str))  if $TargetPlatform =~ /^i[3456]86-/m;
+     return(&process_asm_block_x86_64($str))  if $TargetPlatform =~ /^x86_64-/m;
+     return(&process_asm_block_alpha($str)) if $TargetPlatform =~ /^alpha-/m;
+     return(&process_asm_block_hppa($str))  if $TargetPlatform =~ /^hppa/m;

================================================================
Index: packages/ghc/ghc.spec
diff -u packages/ghc/ghc.spec:1.120 packages/ghc/ghc.spec:1.121
--- packages/ghc/ghc.spec:1.120	Fri Sep  2 10:28:29 2011
+++ packages/ghc/ghc.spec	Mon Sep 26 11:58:55 2011
@@ -4,8 +4,6 @@
 # - happy, alex needed only when using darcs checkout or regenerating parsers
 #   http://hackage.haskell.org/trac/ghc/wiki/Building/Prerequisites
 #
-# TODO (is it still valid?)
-# - patch libraries/terminfo/configure.ac to link against tinfo not ncurses (-Wl,--as-needed) and run autotools only there?
 # - http://hackage.haskell.org/trac/ghc/wiki/Building/Porting
 #
 # Conditional build:
@@ -16,21 +14,20 @@
 Summary:	Glasgow Haskell Compilation system
 Summary(pl.UTF-8):	System kompilacji Glasgow Haskell
 Name:		ghc
-Version:	6.12.3
-Release:	7
+Version:	7.2.1
+Release:	0.1
 License:	BSD-like w/o adv. clause
 Group:		Development/Languages
-Source0:	http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-src.tar.bz2
-# Source0-md5:	4c2663c2eff833d7b9f39ef770eefbd6
+Source0:	http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
+# Source0-md5:	c2a6d1ce13b6bb95fa2d743a143835eb
 %if %{with bootstrap}
-Source3:	http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-i386-unknown-linux-n.tar.bz2
+Source3:	http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-i386-unknown-linux-n.tar.bz2
 # Source3-md5:	8ed8540571f7b10d8caf782755e35818
-Source4:	http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-x86_64-unknown-linux-n.tar.bz2
+Source4:	http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-x86_64-unknown-linux-n.tar.bz2
 # Source4-md5:	d58e5a50d8b120ac933afbd10a773aef
 %endif
 Patch0:		%{name}-pld.patch
 Patch1:		%{name}-pkgdir.patch
-Patch2:		%{name}-build.patch
 URL:		http://haskell.org/ghc/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -130,13 +127,12 @@
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 # use ld.bfd
-install -d our-ld
-ln -s %{_bindir}/ld.bfd our-ld/ld
-export PATH=$(pwd)/our-ld:$PATH
+#install -d our-ld
+#ln -s %{_bindir}/ld.bfd our-ld/ld
+#export PATH=$(pwd)/our-ld:$PATH
 
 
 %{__autoconf}
@@ -823,6 +819,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2011/09/26 09:58:55  baggins
+- updated to 7.2.1
+
 Revision 1.120  2011/09/02 08:28:29  arekm
 - release 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc-pkgdir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc-pld.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc.spec?r1=1.120&r2=1.121&f=u

More information about the pld-cvs-commit mailing list