Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2019-10-07 13:46:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Mon Oct 7 13:46:04 2019 rev:75 rq:734101 version:8.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-04-26 22:55:12.749285660 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new.2352/ghc.changes 2019-10-07 14:13:54.806923181 +0200 @@ -1,0 +2,8 @@ +Mon Sep 23 09:28:37 UTC 2019 - Andreas Schwab <[email protected]> + +- Enable build on riscv64 +- Add memory constraints for riscv64, restrict to 2 jobs +- allow-riscv-and-riscv64-CPU.patch: recognize riscv64 as architecture +- Apply Disable-unboxed-arrays.patch also on s390x + +------------------------------------------------------------------- New: ---- allow-riscv-and-riscv64-CPU.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.CcCkfu/_old 2019-10-07 14:13:55.642920887 +0200 +++ /var/tmp/diff_new_pack.CcCkfu/_new 2019-10-07 14:13:55.642920887 +0200 @@ -26,7 +26,7 @@ %define with_libnuma 0 %endif -%global unregisterised_archs s390 s390x +%global unregisterised_archs s390 s390x riscv64 Name: ghc Version: 8.6.5 @@ -35,7 +35,7 @@ Summary: The Glorious Glasgow Haskell Compiler License: BSD-3-Clause Group: Development/Languages/Other -ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le s390x +ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le s390x riscv64 # hard to port to PIE, some prebuilt static libraries are non-PIC ... #!BuildIgnore: gcc-PIE BuildRequires: binutils-devel @@ -93,6 +93,8 @@ Patch2: D5212.patch # PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch [email protected] -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411. Patch3: Disable-unboxed-arrays.patch +# PATCH-FIX-UPSTREAM allow-riscv-and-riscv64-CPU.patch [email protected] -- aclocal.m4: allow riscv and riscv64 CPU +Patch4: allow-riscv-and-riscv64-CPU.patch # PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform Patch35: ghc-pie.patch # PATCH-FIX-OPENSUSE ghc-8.0.2-Cabal-dynlibdir.patch -- Fix shared library directory location. @@ -204,9 +206,10 @@ %setup -q %patch1 -p1 %patch2 -p1 -%ifarch ppc64 +%ifarch ppc64 s390 s390x %patch3 -p1 %endif +%patch4 -p1 %patch35 -p1 %patch100 -p1 %patch110 -p1 @@ -264,7 +267,7 @@ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --with-system-libffi -%ifnarch s390 s390x +%ifnarch s390 s390x riscv64 %if 0%{?suse_version} >= 1500 %limit_build -m 2000 make %{?_smp_mflags} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.CcCkfu/_old 2019-10-07 14:13:55.674920799 +0200 +++ /var/tmp/diff_new_pack.CcCkfu/_new 2019-10-07 14:13:55.674920799 +0200 @@ -7,4 +7,14 @@ <size unit="G">4</size> </physicalmemory> </hardware> + <overwrite> + <conditions> + <arch>riscv64</arch> + </conditions> + <hardware> + <physicalmemory> + <size unit="G">20</size> + </physicalmemory> + </hardware> + </overwrite> </constraints> ++++++ allow-riscv-and-riscv64-CPU.patch ++++++ Description: cherry-pick of upstream commits beba89a0f16681c85d39fc8a894bde4162ff492a.patch: 5e63a25249f3cb07300258e115af9ff55079d2ea.patch: Last-Update: 2019-05-27 Index: ghc-8.6.5/aclocal.m4 =================================================================== --- ghc-8.6.5.orig/aclocal.m4 +++ ghc-8.6.5/aclocal.m4 @@ -217,7 +217,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V mipsel) test -z "[$]2" || eval "[$]2=ArchMipsel" ;; - hppa|hppa1_1|ia64|m68k|nios2|rs6000|s390|s390x|sh4|vax) + hppa|hppa1_1|ia64|m68k|nios2|riscv32|riscv64|rs6000|s390|s390x|sh4|vax) test -z "[$]2" || eval "[$]2=ArchUnknown" ;; *) @@ -1906,6 +1906,12 @@ case "$1" in powerpc*) $2="powerpc" ;; + riscv64*) + $2="riscv64" + ;; + riscv|riscv32*) + $2="riscv32" + ;; rs6000) $2="rs6000" ;;
