From: Peter Michael Green Date: Mon, 24 Aug 2020 15:29:58 +0000 (+0000) Subject: Manual merge of version 3.0.4+dfsg-23+rpi1 and 3.2.0+dfsg-8 to produce 3.2.0+dfsg... X-Git-Tag: archive/raspbian/3.2.0+dfsg-8+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0878289bc96dea879dc72498072820235eeca1b9;p=fpc.git Manual merge of version 3.0.4+dfsg-23+rpi1 and 3.2.0+dfsg-8 to produce 3.2.0+dfsg-8+rpi1 --- 0878289bc96dea879dc72498072820235eeca1b9 diff --cc debian/changelog index eea6f81e,2b039600..73644173 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,154 +1,161 @@@ - fpc (3.0.4+dfsg-23+rpi1) bullseye-staging; urgency=medium ++fpc (3.2.0+dfsg-8+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green at Mon, 20 Oct 2014 23:12:17 +0000] + * Set compiler defaults for raspbian. + - -- Raspbian forward porter Thu, 28 Nov 2019 13:08:51 +0000 ++ -- Peter Michael Green Mon, 24 Aug 2020 15:09:39 +0000 ++ + fpc (3.2.0+dfsg-8) unstable; urgency=medium + + * Further updates to list of expected test failures on arm32/arm64 + + add ../packages/rtl-objpas/tests/testrunner.rtlobjpas on arm32/arm64 + + add webtbs/tw22992 on arm32 + + add webtbs/tw23185 on arm32 + + -- Peter Michael Green Sat, 22 Aug 2020 13:17:07 +0000 + + fpc (3.2.0+dfsg-7) unstable; urgency=medium + + * Update list of expected test failures on + arm32/arm64/i386 + + add test/cg/tm128 on arm32/i386 + + add test/tarray15 on arm32/arm64/i386 + + add test/tinlrange1 on arm32 + + add test/tinlrange3 on arm32 + + add test/tlib1b on arm32 + + add test/tlibrary2 on arm32 + + add test/tweaklib2 on arm32 + + add tbs/tb0643 on arm32/arm64 + + add webtbs/tw0876 on i386 + + add webtbs/tw12038 on arm32/arm64/i386 + + add webtbs/tw12704b on arm32 + + add webtbs/tw13628b on arm32 + + add webtbs/tw14958b on arm32 + + add webtbs/tw16263b on arm32 + + add webtbs/tw16949b on arm32 + + add webtbs/tw17904 on arm32/arm64/i386 + + add webtbs/tw22744b on arm32/arm64/i386 + + add webtbs/tw22992 on arm32 + + add webtbs/tw23185 on arm32 + + add webtbs/tw26481 on arm32/arm64/i386 + + add webtbs/tw2886 on arm32/arm64/i386 + + add webtbs/tw32671 on i386 + + add webtbs/tw36179 on arm32/arm64 + + add webtbs/tw3964b on arm32 + + add webtbs/tw6822c on arm32 + + add webtbs/tw7838b on arm32 + + add webtbs/tw8730c on arm32 + + add webtbs/tw8730d on arm32 + + add webtbs/tw9089c on arm32 + + add webtbs/tw9089d on arm32 + + add webtbf/tw18225b on i386 + + add webtbf/tw25862 on arm32/arm64 + + -- Peter Michael Green Fri, 21 Aug 2020 11:39:19 +0000 + + fpc (3.2.0+dfsg-6) unstable; urgency=medium + + * Make autopkgtest more verbose. + * Fix issue with autopkgtest trying to use a packaged fcl with a locally + built rtl by cleaning up the rtl that is built during makefile generation + (Closes: 968245) + * Fix version lists in utests.pp + * Make autopkgtest use unified diff to report changes in failures. + * Update list of expected test failures on amd64 + + add test/tarray15 + + add webtbs/tw12038 + + add webtbs/tw17904 + + add webtbs/tw22744b + + add webtbf/tw25862 + + add webtbs/tw26481 + + add webtbs/tw2886 + + add webtbs/tw29957 + + -- Peter Michael Green Tue, 18 Aug 2020 19:53:55 +0000 + + fpc (3.2.0+dfsg-5) unstable; urgency=medium + + * Disable optimizations when building for m68k. + + -- Abou Al Montacir Fri, 07 Aug 2020 17:24:16 +0200 + + fpc (3.2.0+dfsg-4) experimental; urgency=medium + + * Fixed liking with libc when PIC is enabled (x86_64 specific). + + -- Abou Al Montacir Tue, 04 Aug 2020 12:50:43 +0200 + + fpc (3.2.0+dfsg-3) experimental; urgency=medium + + * Fixed default value of units global dir based on base installation dir. + + -- Abou Al Montacir Mon, 03 Aug 2020 23:23:02 +0200 + + fpc (3.2.0+dfsg-2) experimental; urgency=medium + + * Fixed FPCDIR default value detection after FileExist behavior change. + + -- Abou Al Montacir Sun, 02 Aug 2020 19:55:39 +0200 + + fpc (3.2.0+dfsg-1) experimental; urgency=medium + + [ Debian Janitor ] + * Trim trailing whitespace. + Fixes: lintian: file-contains-trailing-whitespace + See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html + * Use secure copyright file specification URI. + Fixes: lintian: insecure-copyright-format-uri + See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html + * Wrap long lines in changelog entries: 3.0.0+dfsg-8, 3.0.0+dfsg-4, 2.6.2-2. + Fixes: lintian: debian-changelog-line-too-long + See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html + * Use secure URI in debian/watch. + Fixes: lintian: debian-watch-uses-insecure-uri + See-also: https://lintian.debian.org/tags/debian-watch-uses-insecure-uri.html + * Set upstream metadata fields: Archive, Repository. + Fixes: lintian: upstream-metadata-file-is-missing + See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html + Fixes: lintian: upstream-metadata-missing-repository + See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html + * Fix day-of-week for changelog entries 2.6.2-1, 2.6.0-6, 2.6.0-1, 2.4.2-3, 2.4.2-1, 2.4.0-3, 2.4.0-2, 2.2.4-5, 2.2.4-4, 2.2.2-6, 2.2.2-5, 2.0.4-rc1, 1.0.4+1.0.6cvs20020228-1, 1.0.1-0. + Fixes: lintian: debian-changelog-has-wrong-day-of-week + See-also: https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html + + -- Abou Al Montacir Sat, 06 Jun 2020 00:27:44 +0200 + + fpc (3.2.0~rc1+dfsg-3) experimental; urgency=medium + + * Support building on ppc64el. + Thanks to John Paul Adrian Glaubitz (Closes: #963623) + * Fix FTBFS on m68k + + -- Paul Gevers Thu, 25 Jun 2020 17:19:22 +0200 + + fpc (3.2.0~rc1+dfsg-2) experimental; urgency=medium + + [ Paul Gevers ] + * Drop fpcsrc/.gitignore, also from future upstream sources + * Don't install libffi on non-amd64 systems as it's not built there + + [ John Paul Adrian Glaubitz ] + * Enable building on sparc64 + + -- Paul Gevers Tue, 23 Jun 2020 21:44:29 +0200 + + fpc (3.2.0~rc1+dfsg-1) experimental; urgency=medium + + [ Paul Gevers ] + * New upstream release + - refresh and update patches + - refresh debian/control + - recreate d/s/timestamps because of new upstream + + [ Abou Al Montacir ] + * Fixed compilation of msg2inc required to build documentation. + * Fixed compilation of fpcmake to be done only once. + * Add new 3.2.0 units to their respect fp-unit Debian packages. + + -- Abou Al Montacir Thu, 11 Jun 2020 20:47:41 +0200 fpc (3.0.4+dfsg-23) unstable; urgency=medium diff --cc debian/patches/series index e625e2dd,8eca6cee..f26436c5 --- a/debian/patches/series +++ b/debian/patches/series @@@ -24,18 -15,11 +15,12 @@@ fix-spelling-errors-3.patc remove-depreciated-ncursus-variables-declaration.patch drop-jsminifier-from-build-as-we-strip-it.patch create-directory-before-copy-in-Makefile.fpc.patch - fix_texpfncase_test.patch fix-units-path-to-be-multi-arch-safe.patch fix_make_files_generation.patch - fix-IDE-GDB-support.patch + #fix-IDE-GDB-support.patch clean_man_pages.patch - fpcmake-m68k.patch ncurses6.patch - fpc-r38400.patch - arm64-select.patch - arm64-subsetreg-32.patch - Fix-exit-code-on-fpdoc.patch - Fix-documentation-causing-fpdoc-to-crash.patch + fix-FTBFS-on-m68k.patch + Fix-liking-with-libc-when-PIC-is-enabled.patch + fix-utest-version-lists.patch +raspbian.diff diff --cc fpcsrc/compiler/options.pas index aa625498,2cc36670..17319fab --- a/fpcsrc/compiler/options.pas +++ b/fpcsrc/compiler/options.pas @@@ -3731,18 -4067,43 +4067,33 @@@ begi end; end; - { set default cpu type to ARMv6 for Raspbian unless specified otherwise } - if (target_info.abi = abi_eabihf) then - begin - { if the compiler is built for armv6, then - inherit this setting, e.g. Raspian is armhf but - only armv6, this makes rebuilds of the compiler - easier } - if not option.CPUSetExplicitly then - init_settings.cputype:=cpu_armv6; - if not option.OptCPUSetExplicitly then - init_settings.optimizecputype:=cpu_armv6; - end; ++ + { ARMHF defaults } + if (target_info.abi = abi_eabihf) then - { set default cpu type to ARMv7a for ARMHF unless specified otherwise } ++ { set default cpu type to ARMv6 for ARMHF unless specified otherwise } + begin - {$ifdef CPUARMV6} - { if the compiler is built for armv6, then - inherit this setting, e.g. Raspian is armhf but - only armv6, this makes rebuilds of the compiler - easier } + if not option.CPUSetExplicitly then + init_settings.cputype:=cpu_armv6; + if not option.OptCPUSetExplicitly then + init_settings.optimizecputype:=cpu_armv6; - {$else CPUARMV6} - if not option.CPUSetExplicitly then - init_settings.cputype:=cpu_armv7a; - if not option.OptCPUSetExplicitly then - init_settings.optimizecputype:=cpu_armv7a; - {$endif CPUARMV6} + + { Set FPU type } + if not(option.FPUSetExplicitly) then + begin + if init_settings.cputype < cpu_armv7 then + init_settings.fputype:=fpu_vfpv2 + else + init_settings.fputype:=fpu_vfpv3_d16; + end + else + begin + if not (init_settings.fputype in [fpu_vfpv2,fpu_vfpv3,fpu_vfpv3_d16,fpu_vfpv4]) then + begin + Message(option_illegal_fpu_eabihf); + StopOptions(1); + end; + end; + end; if (init_settings.instructionset=is_thumb) and not(CPUARM_HAS_THUMB2 in cpu_capabilities[init_settings.cputype]) then begin