Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2013-12-19 21:36:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-10-31 09:01:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-12-19 21:36:56.000000000 +0100 @@ -1,0 +2,35 @@ +Mon Dec 16 15:03:42 UTC 2013 - [email protected] + +- use correct setting for unregisterised builds (ppc64) +- simplify build setup (generation of mk/build.mk) + +------------------------------------------------------------------- +Mon Dec 16 10:56:21 UTC 2013 - [email protected] + +- don't BR llvm for now +- dblatex broken on older openSUSE + +------------------------------------------------------------------- +Sun Dec 15 10:55:50 UTC 2013 - [email protected] + +- revert LLVM for ppc64 (segfaults during package install) +- fix setting up build.mk +- build perf for all archs + +------------------------------------------------------------------- +Sat Dec 14 08:38:43 UTC 2013 - [email protected] + +- Add llvm-powerpc64-datalayout.patch +* fix LLVM backend for powerpc64 +- build and test LLVM backend on powerpc64 + +------------------------------------------------------------------- +Fri Dec 13 21:59:10 UTC 2013 - [email protected] + +- Add cabal-unversion-docdir.patch +* ghc-rpm-macros don't include versions in package docdirs + starting with version 1.0 +- use standard docdir for ghc +- package pdf and ps manuals + +------------------------------------------------------------------- New: ---- ghc-cabal-unversion-docdir.patch llvm-powerpc64-datalayout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.VgtYY5/_old 2013-12-19 21:36:59.000000000 +0100 +++ /var/tmp/diff_new_pack.VgtYY5/_new 2013-12-19 21:36:59.000000000 +0100 @@ -77,6 +77,9 @@ BuildRequires: ncurses-devel BuildRequires: pkg-config %if %{undefined without_manual} +%if 0%{suse_version} >= 1220 +BuildRequires: dblatex +%endif BuildRequires: docbook-utils BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt @@ -102,6 +105,10 @@ Patch6: 0001-Delete-spurious-comma-in-configure.ac.patch # PATCH-FIX-UPSTREAM [email protected] - Fix Haskell trac #8134. Patch7: ghc-fix-infinite-loop-big-endian.patch +# PATCH-FIX-UPSTREAM [email protected] - Add target datalayout for llvm on powerpc 64. +Patch8: llvm-powerpc64-datalayout.patch +# PATCH-FIX-OPENSUSE [email protected] - Remove versions in library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can be removed once we move to ghc 7.8.x. Fedora patch 16. +Patch9: ghc-cabal-unversion-docdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -203,6 +210,8 @@ %patch5 -p1 -b .shm %patch6 -p1 -b .comma %patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build # required for patch and patch1 @@ -231,15 +240,26 @@ make clean %endif -# http://hackage.haskell.org/trac/ghc/wiki/Platforms -# cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc -cat > mk/build.mk << EOF +cat > mk/build.mk <<EOF %ifnarch %{unregisterised_archs} BuildFlavour = perf %endif +EOF + +# BuildFlavours are defined in mk/build.mk.sample +cat mk/build.mk.sample >> mk/build.mk +# override some settings +cat >> mk/build.mk << EOF GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p} %ifarch %{unregisterised_archs} -GhcUnregisterised=YES +GhcUnregisterised = YES +GhcWithNativeCodeGen = NO +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O2 +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +SplitObjs = NO %endif %if %{defined without_haddock} HADDOCK_DOCS = NO @@ -251,8 +271,6 @@ HSCOLOUR_SRCS = NO %endif EOF -# BuildFlavours are defined in mk/build.mk.sample -cat mk/build.mk.sample >> mk/build.mk export CFLAGS="${CFLAGS:-%optflags}" ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ @@ -260,7 +278,6 @@ --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ - --docdir=%{ghcdocroot} \ %{?ghc_boot:--with-ghc=%{_builddir}/ghc-boot/bin/ghc} \ --with-system-libffi \ --with-gcc=%{_bindir}/gcc @@ -394,7 +411,7 @@ %{ghclibdir}/runghc %{ghclibdir}/template-hsc.h %{ghclibdir}/unlit -%dir %{ghcdocroot} +%dir %{_datadir}/doc/ghc %dir %{ghcdocbasedir} %dir %{ghcdocbasedir}/libraries %{_mandir}/man1/ghc.* @@ -405,6 +422,10 @@ %{ghclibdir}/latex %{ghclibdir}/haddock %if %{undefined without_manual} +%if 0%{suse_version} >= 1220 +%{_datadir}/doc/ghc/haddock.* +%{_datadir}/doc/ghc/users_guide.* +%endif %{ghcdocbasedir}/haddock %{ghcdocbasedir}/users_guide %endif ++++++ ghc-cabal-unversion-docdir.patch ++++++ --- ghc-7.6.3/utils/ghc-cabal/Main.hs~ 2013-04-19 06:22:47.000000000 +0900 +++ ghc-7.6.3/utils/ghc-cabal/Main.hs 2013-10-29 12:35:18.916340631 +0900 @@ -180,8 +180,8 @@ libsubdir = toPathTemplate "$pkgid", docdir = toPathTemplate $ if relocatableBuild - then "$topdir/../doc/html/libraries/$pkgid" - else (myDocdir </> "$pkgid"), + then "$topdir/../doc/html/libraries/$pkg" + else (myDocdir </> "$pkg"), htmldir = toPathTemplate "$docdir" } progs = withPrograms lbi ++++++ llvm-powerpc64-datalayout.patch ++++++ Index: ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Ppr.hs =================================================================== --- ghc-7.6.3.orig/compiler/llvmGen/LlvmCodeGen/Ppr.hs +++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Ppr.hs @@ -68,6 +68,13 @@ moduleLayout = $+$ text "target triple = \"arm-unknown-linux-gnueabi\"" #endif +#elif defined (powerpc64_TARGET_ARCH) + +#if linux_TARGET_OS + text "target datalayout = \"E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v128:128:128-n32:64\"" + $+$ text "target triple = \"powerpc64-unknown-linux-gnu\"" +#endif + #else -- FIX: Other targets empty -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
