Author: arekm Date: Sun Feb 27 11:03:20 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; m4 macro fix from upstream
---- Files affected: packages/ghc: ghc.spec (1.115 -> 1.116) , ghc-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ghc/ghc.spec diff -u packages/ghc/ghc.spec:1.115 packages/ghc/ghc.spec:1.116 --- packages/ghc/ghc.spec:1.115 Thu Feb 24 11:47:28 2011 +++ packages/ghc/ghc.spec Sun Feb 27 12:03:11 2011 @@ -17,7 +17,7 @@ Summary(pl.UTF-8): System kompilacji Glasgow Haskell Name: ghc Version: 6.12.3 -Release: 4 +Release: 5 License: BSD-like w/o adv. clause Group: Development/Languages Source0: http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-src.tar.bz2 @@ -30,6 +30,7 @@ %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 @@ -129,6 +130,7 @@ %endif %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__autoconf} @@ -815,6 +817,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.116 2011/02/27 11:03:11 arekm +- rel 5; m4 macro fix from upstream + Revision 1.115 2011/02/24 10:47:28 glen - use %ghc_pkg_recache macro with umask; rel 4 ================================================================ Index: packages/ghc/ghc-build.patch diff -u /dev/null packages/ghc/ghc-build.patch:1.1 --- /dev/null Sun Feb 27 12:03:20 2011 +++ packages/ghc/ghc-build.patch Sun Feb 27 12:03:11 2011 @@ -0,0 +1,11 @@ +--- ghc-6.12.3/aclocal.m4~ 2011-02-27 11:48:59.360195820 +0100 ++++ ghc-6.12.3/aclocal.m4 2011-02-27 12:02:13.969509541 +0100 +@@ -123,7 +123,7 @@ + # A variation of AC_CHECK_SIZEOF for computing the alignment restrictions of a + # given type. Defines ALIGNMENT_TYPE. + AC_DEFUN([FP_CHECK_ALIGNMENT], +-[AS_LITERAL_IF([$1], [], ++[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [], + [AC_FATAL([$0: requires literal arguments])])[]dnl + AC_CHECK_TYPE([$1], [], [], [$3])[]dnl + m4_pushdef([fp_Cache], [AS_TR_SH([fp_cv_alignment_$1])])[]dnl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc.spec?r1=1.115&r2=1.116&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
