Peter Robinson <pbrobinson@xxxxxxxxx> wrote: > I'm having issues with: > aws > gnatcoll > matreshka > > All of which have issues other than gnat 5. If you could have a look > at those and if you need help getting them built/submitted reach out > to me on email/IRC and I'll help get the the fixes built/landed. All > the dependencies are in the f22-override for the next day or so. Thanks to the override of Templates Parser I could figure out the problem with AWS. When I tried to scratch-build the fix the override had already expired, but I think this patch should fix it. Björn Persson
From d16d5ec068cc08eb7190df661a9837b6ee363853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= <Bjorn@Rombobjörn.se> Date: Thu, 30 Apr 2015 04:04:57 +0200 Subject: [PATCH] Made Input_Limit atomic again on 32-bit platforms as Stream_Element_Offset is now a 64-bit type. --- aws-3.1.0-atomic_Input_Limit.patch | 38 ++++++++++++++++++++++++++++++++++++++ aws.spec | 8 ++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 aws-3.1.0-atomic_Input_Limit.patch diff --git a/aws-3.1.0-atomic_Input_Limit.patch b/aws-3.1.0-atomic_Input_Limit.patch new file mode 100644 index 0000000..01d6e92 --- /dev/null +++ b/aws-3.1.0-atomic_Input_Limit.patch @@ -0,0 +1,38 @@ +--- src/core/aws-net-buffered.adb 2013-03-19 14:26:18.000000000 +0100 ++++ src/core/aws-net-buffered.adb 2015-04-30 03:29:30.641692000 +0200 +@@ -36,7 +36,7 @@ + CRLF : constant Stream_Element_Array := + Translator.To_Stream_Element_Array (ASCII.CR & ASCII.LF); + +- Input_Limit : Stream_Element_Offset := AWS.Default.Input_Line_Size_Limit; ++ Input_Limit : Positive := AWS.Default.Input_Line_Size_Limit; + pragma Atomic (Input_Limit); + + procedure Read (Socket : Socket_Type'Class); +@@ -82,7 +82,7 @@ + + function Get_Input_Limit return Stream_Element_Offset is + begin +- return Input_Limit; ++ return Stream_Element_Offset (Input_Limit); + end Get_Input_Limit; + + -------------- +@@ -302,7 +302,7 @@ + if Wait then + Append (Buffer, C.Buffer (C.First .. C.Last)); + +- if Size (Buffer) > Input_Limit then ++ if Size (Buffer) > Stream_Element_Offset (Input_Limit) then + raise Data_Overflow with + "Size" & Stream_Element_Offset'Image (Size (Buffer)); + end if; +@@ -364,7 +364,7 @@ + + procedure Set_Input_Limit (Limit : Positive) is + begin +- Input_Limit := Stream_Element_Offset (Limit); ++ Input_Limit := Limit; + end Set_Input_Limit; + + -------------- diff --git a/aws.spec b/aws.spec index c42c919..de21f7d 100644 --- a/aws.spec +++ b/aws.spec @@ -12,6 +12,9 @@ URL: http://libre.adacore.com/tools/aws Source0: %{name}-gpl-%{version}-src.tgz Source1: %{name}-manpages.tar.gz Patch0: %{name}-%{version}-remove_bundled_static.patch +# Fix to make Input_Limit atomic on 32-bit platforms as Stream_Element_Offset +# is now a 64-bit type, backported from 3.2.0: +Patch1: aws-3.1.0-atomic_Input_Limit.patch BuildRequires: fedora-gnat-project-common >= 3 BuildRequires: gcc-gnat libgcrypt-devel BuildRequires: gprbuild xmlada-devel @@ -70,6 +73,7 @@ Documentation can be found in -doc subpackage %setup -q -n %{name}-gpl-%{version}-src tar -xvf %{SOURCE1} %patch0 -p1 +%patch1 rm -rf templates_parser rm -rf include/zlib* @@ -128,8 +132,8 @@ rm -rf %{buildroot}/%{_libdir}/%{name}/static %changelog -* Wed Apr 29 2015 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> 3.1.0-13 -- rebuild (gcc / gnat 5) +* Thu Apr 30 2015 Björn Persson <Bjorn@xxxxxxxxxxxxxxxxxxxx> - 3.1.0-13 +- Patched to build with GCC 5. * Sat Oct 11 2014 Pavel Zhukov <landgraf@xxxxxxxxxxxxxxxxx> - 3.1.0-12 - Fixed typos -- 2.1.0
Attachment:
pgpln7p6cJ48I.pgp
Description: OpenPGP digital signatur
-- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
