- disable gdb in IDE, it hasn't bee updated for ages and is broken with gdb 8.0

diff --git a/fpc-gdb.patch b/fpc-gdb.patch
index e2ce752bd3e36065983a823f5ace64fbdb8b4eff..55f6d3af4c227fef78a673b523e833eda680791b 100644 (file)
--- a/fpc-gdb.patch
+++ b/fpc-gdb.patch
@@ -1,9 +1,21 @@
 --- fpcbuild-2.6.4/fpcsrc/packages/gdbint/src/gdbint.pp~       2016-04-01 17:53:51.000000000 +0900
 +++ fpcbuild-2.6.4/fpcsrc/packages/gdbint/src/gdbint.pp        2016-04-01 23:08:14.978738263 +0900
-@@ -59,6 +59,28 @@
+@@ -59,6 +59,40 @@
  
  {$undef GDB_VERSION_RECOGNIZED}
  
++{ 8.0 }
++{$ifdef GDB_V800}
++  {$info using gdb 8.0.x}
++  {$define GDB_VERSION_RECOGNIZED}
++  {$define GDB_VER_GE_800}
++  {$LINKLIB stdc++}
++{$endif}
++
++{$ifdef GDB_VER_GE_800}
++  {$define GDB_VER_GE_711}
++{$endif}
++
 +{ 7.11.x }
 +{$ifdef GDB_V711}
 +  {$info using gdb 7.11.x}

diff --git a/fpc.spec b/fpc.spec
index 4413cf88cb8e6b28f3f42f798f64b5040cd82d49..c4757b5968ce0f3f5ab2d7349e87ea32c02aa242 100644 (file)
--- a/fpc.spec
+++ b/fpc.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_without ide     # FPC IDE
+%bcond_with    gdb     # GDB support in FPC IDE
 %bcond_without doc     # documentation
 
 Summary:       Free Pascal - 32-bit Pascal compiler
@@ -33,7 +34,7 @@ BuildRequires:        rpmbuild(macros) >= 1.213
 %if %{with ide}
 BuildRequires: babeltrace-devel
 BuildRequires: expat-devel
-BuildRequires: gdb-lib >= 7.2-7
+%{?with_gdb:BuildRequires:     gdb-lib >= 7.2-7}
 BuildRequires: guile-devel
 BuildRequires: python-devel
 BuildRequires: readline-devel
@@ -234,7 +235,8 @@ esac
        RELEASE="1" \
        BASEINSTALLDIR=%{_libdir}/%{name}/%{version} \
        BININSTALLDIR=%{_bindir} \
-       GDBLIBDIR=%{_libdir} \
+       %{?with_gdb:GDBLIBDIR=%{_libdir}} \
+       %{!?with_gdb:NOGDB=YES} \
        DATA2INC="$DATA2INC" \
        PP="$NEWPP" \
        FPC="$NEWPP" \