diff -Nru mono-4.2.1.102+dfsg2/debian/changelog mono-4.2.1.102+dfsg2/debian/changelog --- mono-4.2.1.102+dfsg2/debian/changelog 2016-05-27 09:52:00.000000000 +0000 +++ mono-4.2.1.102+dfsg2/debian/changelog 2016-10-01 11:56:18.000000000 +0000 @@ -1,3 +1,10 @@ +mono (4.2.1.102+dfsg2-8.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fails to build mono when PPC_64K_PAGES is set. Closes: #819711 + + -- Mathieu Malaterre Sat, 01 Oct 2016 11:56:18 +0000 + mono (4.2.1.102+dfsg2-8) unstable; urgency=medium * [cf4937c] Fixes for ARM64 packages. Thanks to Matthias Klose diff -Nru mono-4.2.1.102+dfsg2/debian/control mono-4.2.1.102+dfsg2/debian/control --- mono-4.2.1.102+dfsg2/debian/control 2016-04-18 10:43:01.000000000 +0000 +++ mono-4.2.1.102+dfsg2/debian/control 2016-10-01 11:56:18.000000000 +0000 @@ -24,7 +24,7 @@ Package: mono-runtime-common Provides: cli-runtime, cli-virtual-machine -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Replaces: mono-common (<< 2.4), mono-jit (<< 2.4), libmono0 (<< 2.4), mono-runtime (<< 3.2.1) Conflicts: mono-common (<< 2.4), mono-jit (<< 2.4), @@ -50,7 +50,7 @@ MIPS architectures. Optionally this package configures BINFMT support. Package: mono-runtime -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends}, mono-runtime-sgen (= ${binary:Version}) @@ -70,7 +70,7 @@ This package installs this architecture's default runtime version. Package: mono-runtime-sgen -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends}, mono-runtime-common (= ${binary:Version}) @@ -92,7 +92,7 @@ collector. Package: mono-runtime-boehm -Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends}, mono-runtime-common (= ${binary:Version}) @@ -114,10 +114,10 @@ Package: mono-runtime-dbg Priority: extra Section: debug -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Replaces: mono-jit-dbg (<< 2.4) Conflicts: mono-jit-dbg (<< 2.4) -Depends: ${misc:Depends}, mono-runtime-sgen (= ${binary:Version}), mono-runtime-boehm (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x] +Depends: ${misc:Depends}, mono-runtime-sgen (= ${binary:Version}), mono-runtime-boehm (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x] Recommends: gdb Description: Mono runtime, debugging symbols Mono is a platform for running and developing applications based on the @@ -130,9 +130,9 @@ Package: mono-utils Provides: cil-disassembler -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Replaces: mono-mcs (<= 1.1.6-4) -Depends: ${shlibs:Depends}, ${misc:Depends}, libmonoboehm-2.0-1 (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], +Depends: ${shlibs:Depends}, ${misc:Depends}, libmonoboehm-2.0-1 (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x], libmono-corlib4.5-cil (= ${source:Version}) Description: Mono utilities Mono is a platform for running and developing applications based on the @@ -158,7 +158,7 @@ Mono keystore. Package: mono-complete -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${misc:Depends}, mono-runtime (= ${binary:Version}), mono-runtime-sgen (= ${binary:Version}) [amd64 armel arm64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x], @@ -192,10 +192,10 @@ You should build-depend on cli-common-dev and the needed libraries instead. Package: libmono-2.0-1 -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Replaces: libmono-dev (<= 1.1.6-4) Conflicts: mono-utils (<< 1.2.3.1-4) -Depends: ${shlibs:Depends}, ${misc:Depends}, libmonoboehm-2.0-1 (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmonosgen-2.0-1 (= ${binary:Version}) [arm64] +Depends: ${shlibs:Depends}, ${misc:Depends}, libmonoboehm-2.0-1 (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x], libmonosgen-2.0-1 (= ${binary:Version}) [arm64] Description: Mono JIT library (Default version) Shared library for Mono, used for embedding/hosting of the JIT. . @@ -206,8 +206,8 @@ bytecode (aka assemblies), and a class library. Package: libmono-2.0-dev -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x -Depends: ${misc:Depends}, libmonoboehm-2.0-dev (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmonosgen-2.0-dev (= ${binary:Version}) [arm64] +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x +Depends: ${misc:Depends}, libmonoboehm-2.0-dev (= ${binary:Version}) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x], libmonosgen-2.0-dev (= ${binary:Version}) [arm64] Description: Mono JIT library - Development files (Default version) Header files and static libraries for libmono-2.0. . @@ -218,7 +218,7 @@ bytecode (aka assemblies), and a class library. Package: libmonosgen-2.0-1 -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends} Description: Mono JIT library (SGen GC) Shared library for Mono, used for embedding/hosting of the JIT. @@ -232,7 +232,7 @@ Package: libmonosgen-2.0-1-dbg Priority: extra Section: debug -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${misc:Depends}, libmonosgen-2.0-1 (= ${binary:Version}) Recommends: gdb Description: Mono JIT library, debugging symbols (SGen GC) @@ -245,7 +245,7 @@ bytecode (aka assemblies), and a class library. Package: libmonosgen-2.0-dev -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${misc:Depends}, libmonosgen-2.0-1 (= ${binary:Version}) Description: Mono JIT library - Development files (SGen GC) Header files and static libraries for libmonosgen-2.0. @@ -257,7 +257,7 @@ bytecode (aka assemblies), and a class library. Package: libmonoboehm-2.0-1 -Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends} Description: Mono JIT library (Boehm GC) Shared library for Mono, used for embedding/hosting of the JIT. @@ -271,7 +271,7 @@ Package: libmonoboehm-2.0-1-dbg Priority: extra Section: debug -Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${misc:Depends}, libmonoboehm-2.0-1 (= ${binary:Version}) Recommends: gdb Description: Mono JIT library, debugging symbols (Boehm GC) @@ -284,7 +284,7 @@ bytecode (aka assemblies), and a class library. Package: libmonoboehm-2.0-dev -Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${misc:Depends}, libmonoboehm-2.0-1 (= ${binary:Version}) Description: Mono JIT library - Development files (Boehm GC) Header files and static libraries for libmonoboehm-2.0. @@ -296,7 +296,7 @@ bytecode (aka assemblies), and a class library. Package: libmono-profiler -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Replaces: mono-runtime (<< 2.4.2.3) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Mono profiler libraries @@ -2895,7 +2895,7 @@ libraries, for CLI 4.0 Package: mono-jay -Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +Architecture: amd64 armel arm64 armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x Depends: ${shlibs:Depends}, ${misc:Depends} Description: LALR(1) parser generator oriented to Java/CLI Mono is a platform for running and developing applications based on the diff -Nru mono-4.2.1.102+dfsg2/debian/mono-archs.make mono-4.2.1.102+dfsg2/debian/mono-archs.make --- mono-4.2.1.102+dfsg2/debian/mono-archs.make 2016-05-27 09:43:37.000000000 +0000 +++ mono-4.2.1.102+dfsg2/debian/mono-archs.make 2016-10-01 11:56:18.000000000 +0000 @@ -1,4 +1,4 @@ -DEB_MONO_BOEHM_ARCHS = amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x +DEB_MONO_BOEHM_ARCHS = amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 powerpc ppc64el s390x DEB_MONO_ARCHS = $(DEB_MONO_BOEHM_ARCHS) arm64 DEB_MONO_SGEN_ARCHS = $(DEB_MONO_ARCHS) diff -Nru mono-4.2.1.102+dfsg2/debian/patches/debian-changes mono-4.2.1.102+dfsg2/debian/patches/debian-changes --- mono-4.2.1.102+dfsg2/debian/patches/debian-changes 2016-05-27 09:53:39.000000000 +0000 +++ mono-4.2.1.102+dfsg2/debian/patches/debian-changes 2016-10-01 11:56:18.000000000 +0000 @@ -12572,7 +12572,7 @@ /* MS_BLOCK_SIZE must be a multiple of the system pagesize, which for some archs is 64k. */ -#if defined(TARGET_POWERPC64) && _CALL_ELF == 2 -+#if defined(TARGET_POWERPC64) ++#if defined(TARGET_POWERPC64) || defined (TARGET_POWERPC) #define ARCH_MIN_MS_BLOCK_SIZE (64*1024) #define ARCH_MIN_MS_BLOCK_SIZE_SHIFT 16 #endif