[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    joost pushed to fpc (master). "Generate Dwarf debug by default on 32-bit targets (rhbz#1475223) (..m
From:       notifications () fedoraproject ! org
Date:       2018-02-28 23:33:40
Message-ID: 20180228233340.D83F46010259 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

From ca5cd49f1a7a9695f603fb4b2964a34d539f92e9 Mon Sep 17 00:00:00 2001
From: Joost van der Sluis <joost@cnoc.nl>
Date: Feb 28 2018 23:31:40 +0000
Subject: Generate Dwarf debug by default on 32-bit targets (rhbz#1475223)

Use the GPLv2+ and LGPLv2+ with exceptions macro instead of %doc for licence files

---

diff --git a/fpc-3.0.4-dwarfdebug.patch b/fpc-3.0.4-dwarfdebug.patch
new file mode 100644
index 0000000..d2cb506
--- /dev/null
+++ b/fpc-3.0.4-dwarfdebug.patch
@@ -0,0 +1,110 @@
+Index: fpcsrc/compiler/systems/i_linux.pas
+===================================================================
+--- fpcsrc/compiler/systems/i_linux.pas	(revision 35632)
++++ fpcsrc/compiler/systems/i_linux.pas	(working copy)
+@@ -73,7 +73,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+@@ -137,7 +137,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+@@ -266,7 +266,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_big;
+             alignment    :
+@@ -392,7 +392,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+@@ -522,7 +522,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_big;
+             alignment    :
+@@ -588,7 +588,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+@@ -654,7 +654,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+@@ -720,7 +720,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_big;
+             alignment    :
+@@ -784,7 +784,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+@@ -852,7 +852,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_big;
+             alignment    :
+@@ -917,7 +917,7 @@
+             linkextern   : ld_linux;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+-            dbg          : dbg_stabs;
++            dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+Index: fpcsrc/utils/fpcm/revision.inc
+===================================================================
+--- fpcsrc/utils/fpcm/revision.inc	(revision 35632)
++++ fpcsrc/utils/fpcm/revision.inc	(working copy)
+@@ -1 +1 @@
+-'2015-10-06 rev 31969'
++'2015-11-13 rev 32319'
diff --git a/fpc.spec b/fpc.spec
index 5aefa40..2ea54b7 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -30,6 +30,9 @@ Source2:        fpc.cft
 Source3:        fppkg.cfg
 Source4:        default.cft
 Patch0:         fpc-3.0.4-r1448.patch
+# On Fedora we do not want stabs debug-information. (even on 32 bit platforms)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1475223 
+Patch1:         fpc-3.0.4-dwarfdebug.patch
 
 Requires:       gpm, ncurses, binutils
 %if ! 0%{?bootstrap}
@@ -83,11 +86,9 @@ automatical-code generation purposes.
 %else
 %ifarch %{arm}
 %define fpcopt -dFPC_ARMHF -k"--build-id"
-%define fpcdebugopt -glw
 %define ppcname ppcarm
 %define fpcarchname arm
 %else
-%define fpcdebugopt -glw
 %define ppcname ppc386
 %define fpcarchname i386
 %endif
@@ -102,6 +103,7 @@ automatical-code generation purposes.
 %setup -n fpcbuild-%{version} -q
 %endif
 %patch0
+%patch1
 
 %build
 # The source-files:
@@ -199,7 +201,7 @@ rm -rf %{buildroot}/usr/lib/%{name}/lexyacc
 %doc %{_defaultdocdir}/%{name}/NEWS
 %doc %{_defaultdocdir}/%{name}/README
 %doc %{_defaultdocdir}/%{name}/faq*
-%doc %{_defaultdocdir}/%{name}/COPYING*
+%license %{_defaultdocdir}/%{name}/COPYING*
 %{_mandir}/*/*
 
 %files doc
@@ -212,6 +214,10 @@ rm -rf %{buildroot}/usr/lib/%{name}/lexyacc
 
 
 %changelog
+* Thu Mar 01 2018 Joost van der Sluis <joost@cnoc.nl> - 3.0.4-1
+- Generate Dwarf debug by default on 32-bit targets (rhbz#1475223)
+- Use the %license macro instead of %doc for licence files
+
 * Fri Feb 09 2018 Joost van der Sluis <joost@cnoc.nl> - 3.0.4-1
 - Upgrade to upstream release 3.0.4.
 - Generate Dwarf- instead of Stabs-debuginfo on i686 and ARMHF


	https://src.fedoraproject.org/rpms/fpc/c/ca5cd49f1a7a9695f603fb4b2964a34d539f92e9?branch=master
_______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic