Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fpc for openSUSE:Factory checked in at 2021-09-29 20:19:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fpc (Old) and /work/SRC/openSUSE:Factory/.fpc.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fpc" Wed Sep 29 20:19:15 2021 rev:11 rq:922199 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/fpc/fpc.changes 2021-04-29 22:52:32.406124337 +0200 +++ /work/SRC/openSUSE:Factory/.fpc.new.1899/fpc.changes 2021-09-29 20:20:53.407160367 +0200 @@ -1,0 +2,15 @@ +Wed Sep 29 06:49:04 UTC 2021 - Luigi Baldoni <aloi...@gmx.com> + +- Update to version 3.2.2 + * See https://wiki.freepascal.org/User_Changes_3.2.2 for + the changelog +- Drop aarch64-fpc-compilation-fix.patch and + aarch64-fpu-initialization.patch (merged upstream) +- Drop fpc-fix-library-paths-on-aarch64.patch (no longer + required) +- Refresh fpc-fix-library-paths-on-ppc64.patch +- Add fpc-3.2.0-glibc-2.34.patch (courtesy of Fedora) +- Add source URLS +- Add _constraints + +------------------------------------------------------------------- Old: ---- aarch64-fpc-compilation-fix.patch aarch64-fpu-initialization.patch fpc-3.2.0-aarch64.zip fpc-3.2.0-ppc.zip fpc-3.2.0-ppc64.zip fpc-3.2.0-ppc64le.zip fpc-fix-library-paths-on-aarch64.patch fpcbuild-3.2.0.tar.gz New: ---- _constraints fpc-3.2.0-glibc-2.34.patch fpc-3.2.2.aarch64-linux.tar fpc-3.2.2.powerpc-linux.tar fpc-3.2.2.powerpc64-linux.tar fpc-3.2.2.powerpc64le-linux.tar fpcbuild-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fpc.spec ++++++ --- /var/tmp/diff_new_pack.yDIUKx/_old 2021-09-29 20:21:01.143171585 +0200 +++ /var/tmp/diff_new_pack.yDIUKx/_new 2021-09-29 20:21:01.147171590 +0200 @@ -1,5 +1,5 @@ # -# spec file for package fpc +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -64,7 +64,7 @@ %endif Name: fpc%{?psuffix} -Version: 3.2.0 +Version: 3.2.2 Release: 0 %if "%{flavor}" == "" Summary: Free Pascal Compiler @@ -76,30 +76,22 @@ Group: Documentation/Other %endif URL: https://www.freepascal.org/ -Source: fpcbuild-%{version}.tar.gz -Source1: fpc-3.2.0-aarch64.zip -Source2: fpc-3.2.0-ppc64le.zip -Source3: fpc-3.2.0-ppc64.zip -Source4: fpc-3.2.0-ppc.zip +Source: https://mirror.freemirror.org/pub/fpc/dist/%{version}/source/fpcbuild-%{version}.tar.gz +Source1: https://mirror.freemirror.org/pub/fpc/dist/%{version}/aarch64-linux/fpc-%{version}.aarch64-linux.tar +Source2: https://mirror.freemirror.org/pub/fpc/dist/%{version}/powerpc64le-linux/fpc-%{version}.powerpc64le-linux.tar +Source3: https://mirror.freemirror.org/pub/fpc/dist/%{version}/powerpc64-linux/fpc-%{version}.powerpc64-linux.tar +Source4: https://mirror.freemirror.org/pub/fpc/dist/%{version}/powerpc-linux/fpc-%{version}.powerpc-linux.tar Source90: fpc-rpmlintrc -Patch0: fpc-fix-library-paths-on-aarch64.patch Patch1: fpc-si_c-x86_64-plt.patch -Patch2: aarch64-fpc-compilation-fix.patch -# From https://github.com/graemeg/freepascal/commit/aad68409bec902e39f9292930238edd32dbc5ac7 -Patch3: aarch64-fpu-initialization.patch Patch4: fpc-fix-library-paths-on-ppc64.patch +# PATCH-FIX-UPSTREAM fpc-3.2.0-glibc-2.34.patch -- aloi...@gmx.com not quite upstream but close enough +Patch5: fpc-3.2.0-glibc-2.34.patch BuildRequires: binutils %if 0%{?suse_version} BuildRequires: fdupes %endif -%if %{without bootstrap} +%if %{without bootstrap} || "%{flavor}" == "doc" BuildRequires: fpc -%else -%if "%{flavor}" == "doc" -BuildRequires: fpc -%else -BuildRequires: unzip -%endif %endif BuildRequires: glibc-devel %if "%{flavor}" == "doc" @@ -113,6 +105,7 @@ BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(float.sty) BuildRequires: tex(hyperref.sty) +BuildRequires: tex(imakeidx.sty) BuildRequires: tex(listings.sty) BuildRequires: tex(pcrr8t.tfm) BuildRequires: tex(phvr8t.tfm) @@ -120,6 +113,7 @@ BuildRequires: tex(syntax.sty) BuildRequires: tex(tabularx.sty) BuildRequires: tex(times.sty) +BuildRequires: tex(upquote.sty) %endif Requires: binutils ExclusiveArch: %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le @@ -159,25 +153,41 @@ %prep %setup -q -n fpcbuild-%{version} -%patch0 -p1 %patch1 -p0 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 +%if 0%{?suse_version} > 1500 +%patch5 -p1 +%endif %if %{with bootstrap} %if "%{flavor}" == "" %ifarch aarch64 -unzip %{SOURCE1} +mkdir %{name}-%{version}-aarch64 +tar xf %{SOURCE1} +tar xf fpc-%{version}.aarch64-linux/binary.aarch64-linux.tar -C fpc-%{version}.aarch64-linux +tar xf fpc-%{version}.aarch64-linux/base.aarch64-linux.tar.gz -C fpc-%{version}-aarch64 +rm -fr fpc-%{version}.aarch64-linux %endif %ifarch ppc64le -unzip %{SOURCE2} +mkdir %{name}-%{version}-ppc64le +tar xf %{SOURCE2} +tar xf fpc-%{version}.powerpc64-linux/binary.powerpc64-linux.tar -C fpc-%{version}.powerpc64-linux +tar xf fpc-%{version}.powerpc64-linux/base.powerpc64-linux.tar.gz -C fpc-%{version}-ppc64le +rm -fr fpc-%{version}.powerpc64-linux %endif %ifarch ppc64 -unzip %{SOURCE3} +mkdir %{name}-%{version}-ppc64 +tar xf %{SOURCE3} +tar xf fpc-%{version}.powerpc64-linux/binary.powerpc64-linux.tar -C fpc-%{version}.powerpc64-linux +tar xf fpc-%{version}.powerpc64-linux/base.powerpc64-linux.tar.gz -C fpc-%{version}-ppc64 +rm -fr fpc-%{version}.powerpc64-linux/ %endif %ifarch ppc -unzip %{SOURCE4} +mkdir %{name}-%{version}-ppc +tar xf %{SOURCE4} +tar xf fpc-%{version}.powerpc-linux/binary.powerpc-linux.tar -C fpc-%{version}.powerpc-linux +tar xf fpc-%{version}.powerpc-linux/base.powerpc-linux.tar.gz -C fpc-%{version}-ppc +rm -fr fpc-%{version}.powerpc-linux %endif %endif %endif @@ -199,7 +209,7 @@ %build %if "%{flavor}" == "" %if %{with bootstrap} -STARTPP=$(pwd)/fpc-%{version}-%{_arch}/bin/%{ppcname} +STARTPP=$(pwd)/fpc-%{version}-%{_arch}/lib/fpc/%{version}/%{ppcname} %else STARTPP=%{ppcname} %endif ++++++ _constraints ++++++ <?xml version="1.0"?> <constraints> <overwrite> <conditions> <arch>ppc</arch> <arch>ppc64</arch> <arch>ppc64le</arch> </conditions> <hardware> <disk> <size unit="G">5</size> </disk> </hardware> </overwrite> <overwrite> <conditions> <arch>aarch64</arch> </conditions> <hardware> <memory> <size unit="G">4</size> </memory> </hardware> </overwrite> </constraints> ++++++ fpc-3.2.0-glibc-2.34.patch ++++++ >From a6c82b6642871e1c68f3839e090b055bee4254b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <d...@danny.cz> Date: Tue, 21 Sep 2021 12:47:28 +0200 Subject: [PATCH] update startup data structs for glibc >= 2.34 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2005910 Fixes: https://gitlab.com/freepascal.org/fpc/source/-/issues/39295 --- fpcsrc/rtl/linux/aarch64/cprt0.as | 6 ++---- fpcsrc/rtl/linux/i386/si_c21.inc | 7 +++---- fpcsrc/rtl/linux/powerpc64/cprt0.as | 4 ++-- fpcsrc/rtl/linux/powerpc64/gprt0.as | 4 ++-- fpcsrc/rtl/linux/powerpc64/si_c.inc | 7 ++----- fpcsrc/rtl/linux/powerpc64/si_g.inc | 7 ++----- fpcsrc/rtl/linux/powerpc/cprt0.as | 4 ++-- 7 files changed, 15 insertions(+), 24 deletions(-) Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/aarch64/cprt0.as =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/aarch64/cprt0.as +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/aarch64/cprt0.as @@ -41,10 +41,8 @@ _start: init, fini, rtld_fini, stack_end) */ adrp x0,:got:PASCALMAIN ldr x0,[x0,#:got_lo12:PASCALMAIN] - adrp x3,:got:__libc_csu_init - ldr x3,[x3,#:got_lo12:__libc_csu_init] - adrp x4,:got:__libc_csu_fini - ldr x4,[x4,#:got_lo12:__libc_csu_fini] + mov x3, #0 /* Used to be init. */ + mov x4, #0 /* Used to be fini. */ bl __libc_start_main /* This should never happen */ Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/i386/si_c21.inc =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/i386/si_c21.inc +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/i386/si_c21.inc @@ -35,8 +35,6 @@ {$asmmode att} -procedure __libc_csu_init; cdecl; external; -procedure __libc_csu_fini; cdecl; external; procedure libc_start_main; external name '__libc_start_main'; procedure libc_exit(code: longint); cdecl; external name 'exit'; @@ -93,8 +91,9 @@ asm pushl %esp { stack_end } pushl %edx { function to be registered with atexit(), passed by loader } - pushl $__libc_csu_fini - pushl $__libc_csu_init + { This used to be the addresses of .fini and .init. } + pushl $0 + pushl $0 pushl %esi { Push second argument: argv. } pushl %ecx { Push first argument: argc. } Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/cprt0.as =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/powerpc64/cprt0.as +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/cprt0.as @@ -351,8 +351,8 @@ _restvr_31: addi r12,r0,-16 start_addresses: .quad 0 /* was _SDA_BASE_ but not in 64-bit ABI*/ .quad main_stub - .quad __libc_csu_init - .quad __libc_csu_fini + .quad 0 /* Used to be init. */ + .quad 0 /* Used to be fini. */ .size start_adresses, .-start_addresses /* Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/gprt0.as =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/powerpc64/gprt0.as +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/gprt0.as @@ -351,8 +351,8 @@ _restvr_31: addi r12,r0,-16 start_addresses: .quad 0 /* was _SDA_BASE_ but not in 64-bit ABI*/ .quad main_stub - .quad __libc_csu_init - .quad __libc_csu_fini + .quad 0 /* Used to be init. */ + .quad 0 /* Used to be fini. */ .size start_adresses, .-start_addresses /* Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/si_c.inc =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/powerpc64/si_c.inc +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/si_c.inc @@ -657,9 +657,6 @@ _restvr_31: addi r12,r0,-16 Process start/halt ******************************************************************************} -procedure __libc_csu_init; cdecl; external; -procedure __libc_csu_fini; cdecl; external; - procedure __libc_start_main(r3,r4,r5,r6,r7,r8,r9: pointer); cdecl; external; var @@ -724,8 +721,8 @@ const end = (sda_base: nil; {* was _SDA_BASE_ but not in 64-bit ABI } main: @main_stub; - libc_csu_init: @__libc_csu_init; - libc_csu_fini: @__libc_csu_fini + libc_csu_init: nil; + libc_csu_fini: nil ); Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/si_g.inc =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/powerpc64/si_g.inc +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc64/si_g.inc @@ -657,9 +657,6 @@ _restvr_31: addi r12,r0,-16 Process start/halt ******************************************************************************} -procedure __libc_csu_init; cdecl; external; -procedure __libc_csu_fini; cdecl; external; - procedure __libc_start_main(r3,r4,r5,r6,r7,r8,r9: pointer); cdecl; external; type @@ -745,8 +742,8 @@ const end = (sda_base: nil; {* was _SDA_BASE_ but not in 64-bit ABI } main: @main_stub; - libc_csu_init: @__libc_csu_init; - libc_csu_fini: @__libc_csu_fini + libc_csu_init: nil; + libc_csu_fini: nil ); procedure call_libc_start_main(r3,r4,r5,r6,r7,r8,r9: pointer); cdecl; Index: fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc/cprt0.as =================================================================== --- fpcbuild-3.2.2.orig/fpcsrc/rtl/linux/powerpc/cprt0.as +++ fpcbuild-3.2.2/fpcsrc/rtl/linux/powerpc/cprt0.as @@ -35,8 +35,8 @@ start_addresses: .long _SDA_BASE_ .long main_stub - .long __libc_csu_init - .long __libc_csu_fini + .long 0 /* Used to be init. */ + .long 0 /* Used to be fini. */ .size start_adresses, .-start_addresses .section ".text" ++++++ fpc-fix-library-paths-on-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.yDIUKx/_old 2021-09-29 20:21:01.211171683 +0200 +++ /var/tmp/diff_new_pack.yDIUKx/_new 2021-09-29 20:21:01.211171683 +0200 @@ -1,11 +1,13 @@ ---- fpcbuild-3.2.0/fpcsrc/compiler/systems/t_linux.pas.orig 2020-09-25 07:43:31.880558566 +0000 -+++ fpcbuild-3.2.0/fpcsrc/compiler/systems/t_linux.pas 2020-09-25 07:55:16.789263339 +0000 +Index: fpcbuild-3.2.2/fpcsrc/compiler/systems/t_linux.pas +=================================================================== +--- fpcbuild-3.2.2.orig/fpcsrc/compiler/systems/t_linux.pas ++++ fpcbuild-3.2.2/fpcsrc/compiler/systems/t_linux.pas @@ -141,7 +141,7 @@ begin if target_info.abi<>abi_powerpc_elfv2 then LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true) else - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true); + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true); - {$else} - {$ifdef aarch64} - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib',true); + {$else powerpc64} + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); + {$endif powerpc64} ++++++ fpcbuild-3.2.0.tar.gz -> fpcbuild-3.2.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/fpc/fpcbuild-3.2.0.tar.gz /work/SRC/openSUSE:Factory/.fpc.new.1899/fpcbuild-3.2.2.tar.gz differ: char 13, line 1
