[packages/fpc] - updated to 3.0.0 - install needs fixing (examples installed to docdir) - powerpc is gone
baggins
baggins at pld-linux.org
Fri Apr 1 17:47:18 CEST 2016
commit 1ac879dafd5c5b503351f0c6bf17a22e09ad1d16
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 2 00:46:29 2016 +0900
- updated to 3.0.0
- install needs fixing (examples installed to docdir)
- powerpc is gone
fpc-gdb.patch | 624 ++--------------------------------------------------
fpc-r22920.patch | 11 -
fpc-r32374.patch | 225 +++++++++++++++++++
fpc.spec | 37 ++--
fpcdocs-r1260.patch | 33 +++
5 files changed, 285 insertions(+), 645 deletions(-)
---
diff --git a/fpc.spec b/fpc.spec
index d59b2cc..32e2e13 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -8,22 +8,21 @@ Summary(pl.UTF-8): 32 bitowy kompilator dla procesorów i386 i m68k
Summary(ru.UTF-8): Свободный компилятор Pascal
Summary(uk.UTF-8): Вільний компілятор Pascal
Name: fpc
-Version: 2.6.4
-Release: 6
+Version: 3.0.0
+Release: 0.1
License: GPL v2+
Group: Development/Languages
Source0: ftp://ftp.freepascal.org/pub/fpc/dist/%{version}/source/%{name}build-%{version}.tar.gz
-# Source0-md5: 403da132aed194fd841d46c3b33b022a
+# Source0-md5: bb7d17ef5c7c007466368262c0779cb7
Source1: ftp://ftp.freepascal.org/pub/fpc/dist/%{version}/i386-linux/%{name}-%{version}.i386-linux.tar
-# Source1-md5: 915f799dd58b5429f06a48d4bd84a9c2
+# Source1-md5: 41e0bcb7c11b7edf311142079ba2defa
Source2: ftp://ftp.freepascal.org/pub/fpc/dist/%{version}/x86_64-linux/%{name}-%{version}.x86_64-linux.tar
-# Source2-md5: ffc3cae4a72b60efb6873b9ce5c8a0f2
-Source3: ftp://ftp.freepascal.org/pub/fpc/dist/%{version}/powerpc-linux/%{name}-%{version}.powerpc-linux.tar
-# Source3-md5: 28eb428bfaa8a72e49be05ed0efa0081
+# Source2-md5: db2ae45b0d1846e01b61ba52f03e60b2
Patch0: %{name}-skip-dev-dot.patch
Patch1: %{name}-link.patch
Patch2: %{name}-gdb.patch
-Patch3: %{name}-r22920.patch
+Patch3: fpc-r32374.patch
+Patch4: fpcdocs-r1260.patch
URL: http://www.freepascal.org/
BuildRequires: binutils-devel >= 3:2.17.50
BuildRequires: gpm-devel
@@ -49,7 +48,7 @@ BuildRequires: texlive-xetex
%endif
Requires: binutils
Provides: fpc-bootstrap
-ExclusiveArch: %{ix86} %{x8664} ppc
+ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -121,6 +120,7 @@ Dokumentacja do fpc w formacie PDF.
%patch1 -p1
%patch2 -p1
%patch3 -p0
+%patch4 -p0
%ifarch %{ix86}
tar xf %{SOURCE1}
@@ -134,12 +134,6 @@ tar xf %{SOURCE2}
%define _bname x64
%define _barch x86_64
%endif
-%ifarch ppc
-tar xf %{SOURCE3}
-%define _bver %{version}
-%define _bname ppc
-%define _barch powepc
-%endif
cd %{name}-%{version}.%{_barch}-linux
tar xf binary.*-linux.tar
@@ -173,8 +167,8 @@ export PATH=$(pwd)/our-ld:$PATH
PP=`pwd`/bin/lib/%{name}/%{_bver}/ppc%{_bname}
NEWPP=`pwd`/fpcsrc/compiler/ppc%{_bname}
-NEWFPDOC=`pwd`/fpcsrc/utils/fpdoc/fpdoc
-DATA2INC=`pwd`/fpcsrc/utils/data2inc
+NEWFPDOC=`pwd`/fpcsrc/utils/fpdoc/bin/%{_barch}-linux/fpdoc
+DATA2INC=`pwd`/fpcsrc/utils/bin/%{_barch}-linux/data2inc
# DO NOT PUT $RPM_OPT_FLAGS IN OPT, IT DOES NOT WORK - baggins
case "%{_build_cpu}" in
@@ -230,7 +224,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir},%{_datadir}/fpcsrc,%{_examp
cp -af fpc-src/* $RPM_BUILD_ROOT%{_datadir}/fpcsrc
NEWPP=`pwd`/fpcsrc/compiler/ppc%{_bname}
-FPCMAKE=`pwd`/fpcsrc/utils/fpcm/fpcmake
+FPCMAKE=`pwd`/fpcsrc/utils/fpcm/bin/%{_barch}-linux/fpcmake
%{__make} -j1 -C fpcsrc \
compiler_distinstall \
rtl_distinstall \
@@ -261,12 +255,8 @@ ln -sf %{_bindir}/ld.bfd $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/ld
sh fpc-src/compiler/utils/samplecfg $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version} $RPM_BUILD_ROOT%{_sysconfdir}
%{__sed} -i -e "s,$RPM_BUILD_ROOT,,g" $RPM_BUILD_ROOT%{_sysconfdir}/{*.cfg,fppkg/default}
-# I have no idea why some units are installed to /usr/lib - baggins
%if "%{_lib}" != "lib"
-cd $RPM_BUILD_ROOT/usr/lib/%{name}/%{version}/units
-for d in * ; do
- %{__mv} $d/* $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/units/$d/
-done
+mv $RPM_BUILD_ROOT/usr/lib/%{name}/lexyacc $RPM_BUILD_ROOT/%{_libdir}/%{name}/
%endif
%clean
@@ -284,6 +274,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/%{name}/lexyacc
%{_libdir}/%{name}/%{version}/msg
%{_libdir}/%{name}/%{version}/units
+%{_libdir}/%{name}/%{version}/fpmkinst
%if %{with ide}
%{_libdir}/%{name}/%{version}/ide
%endif
diff --git a/fpc-gdb.patch b/fpc-gdb.patch
index 082c8a8..84ed8d9 100644
--- a/fpc-gdb.patch
+++ b/fpc-gdb.patch
@@ -1,618 +1,20 @@
---- fpcbuild-2.6.4/fpcsrc/packages/gdbint/src/gdbint.pp.orig 2013-08-07 20:58:05.756050489 +0200
-+++ fpcbuild-2.6.4/fpcsrc/packages/gdbint/src/gdbint.pp 2013-08-07 21:09:31.746021701 +0200
-@@ -14,6 +14,7 @@
- unit GdbInt;
+--- 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,17 @@
- {$mode objfpc}
-+{$smartlink off}
+ {$undef GDB_VERSION_RECOGNIZED}
- {$define NotImplemented}
-
-@@ -39,83 +40,94 @@
-
- interface
-
--{$smartlink off}
-
-
- { Is create_breakpoint_hook deprecated? }
- { Seem not so for 6.1 }
- {$define GDB_HAS_DEPRECATED_CBPH}
-
--{ 6.1.x }
--{$ifdef GDB_V601}
-- {$info using gdb 6.1.x}
-- {$define GDB_V6}
-- {$undef GDB_HAS_DEPRECATED_CBPH}
--{$endif def GDB_V601}
-
--{ 6.2.x }
--{$ifdef GDB_V602}
-- {$info using gdb 6.2.x}
-- {$define GDB_V6}
--{$endif def GDB_V602}
-+{
-+ Excatly one
-+ GDB_VXYZ macro
-+ where XYZ are three numbers
-+ needs to defined
-+ either inside gdblib.inc or gdbver.inc
-+ This corresponds to version
-+ X.YZ.patch_level
-+}
-
--{ 6.3.x }
--{$ifdef GDB_V603}
-- {$info using gdb 6.3.x}
-- {$define GDB_V6}
--{$endif def GDB_V603}
-+{$undef GDB_VERSION_RECOGNIZED}
-
--{ 6.4.x }
--{$ifdef GDB_V604}
-- {$info using gdb 6.4.x}
-- {$define GDB_V6}
-- {$define GDB_NEEDS_NO_ERROR_INIT}
--{$endif def GDB_V604}
-+{ 7.9.x }
-+{$ifdef GDB_V709}
-+ {$info using gdb 7.9.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_VER_GE_709}
-+{$endif}
-
--{ 6.5.x }
--{$ifdef GDB_V605}
-- {$info using gdb 6.5.x}
-- {$define GDB_V6}
-- {$define GDB_NEEDS_NO_ERROR_INIT}
--{$endif def GDB_V605}
-+{$ifdef GDB_VER_GE_709}
-+ {$define GDB_VER_GE_708}
-+{$endif}
-
--{ 6.6.x }
--{$ifdef GDB_V606}
-- {$info using gdb 6.6.x}
-- {$define GDB_V6}
-- {$define GDB_USES_BP_LOCATION}
-- {$define GDB_NEEDS_NO_ERROR_INIT}
-- {$define GDB_USES_EXPAT_LIB}
-- {$define GDB_HAS_DEBUG_FILE_DIRECTORY}
--{$endif def GDB_V606}
-+{ 7.8.x }
-+{$ifdef GDB_V708}
-+ {$info using gdb 7.8.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_VER_GE_708}
-+{$endif}
-
--{ 6.7.x }
--{$ifdef GDB_V607}
-- {$info using gdb 6.7.x}
-- {$define GDB_V6}
-- {$define GDB_USES_BP_LOCATION}
-- {$define GDB_NEEDS_NO_ERROR_INIT}
-- {$define GDB_USES_EXPAT_LIB}
-- {$define GDB_HAS_DEBUG_FILE_DIRECTORY}
--{$endif def GDB_V607}
-+{$ifdef GDB_VER_GE_708}
-+ {$define USE_CATCH_EXCEPTIONS}
-+ {$define USE_LOCAL_SET_GDB_DATA_DIRECTORY}
-+ {$define GDB_VER_GE_707}
-+{$endif}
-
--{ 6.8.x }
--{$ifdef GDB_V608}
-- {$info using gdb 6.8.x}
-- {$define GDB_V6}
-- {$define GDB_USES_BP_LOCATION}
-- {$define GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
-- {$define GDB_NEEDS_NO_ERROR_INIT}
-- {$define GDB_USES_EXPAT_LIB}
-- {$define GDB_HAS_DEBUG_FILE_DIRECTORY}
-- {$define GDB_USES_LIBDECNUMBER}
-- // {$define GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED}
-- {$define GDB_HAS_BP_NONE}
--{$endif def GDB_V608}
-+{ 7.7.x }
-+{$ifdef GDB_V707}
-+ {$info using gdb 7.7.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_VER_GE_707}
-+{$endif}
-+
-+{$ifdef GDB_VER_GE_707}
-+ {$define GDB_VER_GE_706}
-+{$endif}
-+
-+{ 7.6.x }
-+{$ifdef GDB_V706}
-+ {$info using gdb 7.6.x}
++{ 7.10.x }
++{$ifdef GDB_V710}
++ {$info using gdb 7.10.x}
+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_VER_GE_706}
++ {$define GDB_VER_GE_710}
+{$endif}
+
-+{$ifdef GDB_VER_GE_706}
-+ {$define GDB_UI_FILE_HAS_FSEEK}
-+ {$define GDB_VER_GE_705}
-+{$endif}
-+
-+{ 7.5.x }
-+{$ifdef GDB_V705}
-+ {$info using gdb 7.5.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_VER_GE_705}
-+{$endif}
-+
-+{$ifdef GDB_VER_GE_705}
-+ {$define GDB_VER_GE_704}
-+ {$define GDB_BP_LOCATION_HAS_COND_BYTECODE}
-+ {$define GDB_BP_LOCATION_HAS_RELATED_ADDRESS}
-+ {$define GDB_BP_HAS_ENABLE_COUNT}
-+{$endif}
-
- { 7.4.x }
- {$ifdef GDB_V704}
- {$info using gdb 7.4.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_VER_GE_704}
-+{$endif}
-+
-+{$ifdef GDB_VER_GE_704}
- {$define GDB_V7}
- {$define GDB_BP_LOCATION_HAS_GDBARCH}
- {$define GDB_HAS_PROGRAM_SPACE}
-@@ -131,11 +143,12 @@
- {$ifdef win32}
- {$define GDB_USES_LIBADVAPI32}
- {$endif win32}
--{$endif def GDB_V704}
-+{$endif def GDB_VER_GE_704}
-
- { 7.3.x }
- {$ifdef GDB_V703}
- {$info using gdb 7.3.x}
-+ {$define GDB_VERSION_RECOGNIZED}
- {$define GDB_V7}
- {$define GDB_BP_LOCATION_HAS_GDBARCH}
- {$define GDB_HAS_PROGRAM_SPACE}
-@@ -150,11 +163,13 @@
- {$define GDB_BP_LOCATION_HAS_OPS}
- {$define GDB_UI_FILE_HAS_WRITE_ASYNC}
- {$endif GDB_CVS}
-+ {$define GDB_VERSION_RECOGNIZED}
- {$endif def GDB_V703}
-
- { 7.2.x }
- {$ifdef GDB_V702}
- {$info using gdb 7.2.x}
-+ {$define GDB_VERSION_RECOGNIZED}
- {$define GDB_V7}
- {$define GDB_BP_LOCATION_HAS_GDBARCH}
- {$define GDB_HAS_PROGRAM_SPACE}
-@@ -163,6 +178,7 @@
- { 7.1.x }
- {$ifdef GDB_V701}
- {$info using gdb 7.1.x}
-+ {$define GDB_VERSION_RECOGNIZED}
- {$define GDB_V7}
- {$define GDB_BP_LOCATION_HAS_GDBARCH}
- {$define GDB_HAS_PROGRAM_SPACE}
-@@ -173,6 +189,7 @@
- { 7.0.x }
- {$ifdef GDB_V700}
- {$info using gdb 7.0.x}
-+ {$define GDB_VERSION_RECOGNIZED}
- {$define GDB_V7}
- {$ifdef GDB_CVS}
- {$define GDB_BP_LOCATION_HAS_GDBARCH}
-@@ -197,9 +214,92 @@
- {$define GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED}
- {$define GDB_TARGET_CLOSE_HAS_PTARGET_ARG}
- {$define GDB_HAS_BP_NONE}
-+ {$define GDB_USE_XSTRVPRINTF}
- {$endif def GDB_V7}
-
-
-+{ 6.8.x }
-+{$ifdef GDB_V608}
-+ {$info using gdb 6.8.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+ {$define GDB_USES_BP_LOCATION}
-+ {$define GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
-+ {$define GDB_NEEDS_NO_ERROR_INIT}
-+ {$define GDB_USES_EXPAT_LIB}
-+ {$define GDB_HAS_DEBUG_FILE_DIRECTORY}
-+ {$define GDB_USES_LIBDECNUMBER}
-+ // {$define GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED}
-+ {$define GDB_HAS_BP_NONE}
-+{$endif def GDB_V608}
-+
-+{ 6.7.x }
-+{$ifdef GDB_V607}
-+ {$info using gdb 6.7.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+ {$define GDB_USES_BP_LOCATION}
-+ {$define GDB_NEEDS_NO_ERROR_INIT}
-+ {$define GDB_USES_EXPAT_LIB}
-+ {$define GDB_HAS_DEBUG_FILE_DIRECTORY}
-+{$endif def GDB_V607}
-+
-+{ 6.6.x }
-+{$ifdef GDB_V606}
-+ {$info using gdb 6.6.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+ {$define GDB_USES_BP_LOCATION}
-+ {$define GDB_NEEDS_NO_ERROR_INIT}
-+ {$define GDB_USES_EXPAT_LIB}
-+ {Official 6.6 release doesn't have GDB_HAS_DEBUG_FILE_DIRECTORY}
-+{$endif def GDB_V606}
-+
-+{ 6.5.x }
-+{$ifdef GDB_V605}
-+ {$info using gdb 6.5.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+ {$define GDB_NEEDS_NO_ERROR_INIT}
-+{$endif def GDB_V605}
-+
-+{ 6.4.x }
-+{$ifdef GDB_V604}
-+ {$info using gdb 6.4.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+ {$define GDB_NEEDS_NO_ERROR_INIT}
-+{$endif def GDB_V604}
-+
-+{ 6.3.x }
-+{$ifdef GDB_V603}
-+ {$info using gdb 6.3.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+{$endif def GDB_V603}
-+
-+{ 6.2.x }
-+{$ifdef GDB_V602}
-+ {$info using gdb 6.2.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+{$endif def GDB_V602}
-+
-+{ 6.1.x }
-+{$ifdef GDB_V601}
-+ {$info using gdb 6.1.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+ {$undef GDB_HAS_DEPRECATED_CBPH}
-+{$endif def GDB_V601}
-+
-+{ 6.0.x }
-+{$ifdef GDB_V600}
-+ {$info using gdb 6.0.x}
-+ {$define GDB_VERSION_RECOGNIZED}
-+ {$define GDB_V6}
-+{$endif def GDB_V600}
-+
- {$ifdef GDB_V6}
- {$define GDB_HAS_SYSROOT}
- {$define GDB_HAS_DB_COMMANDS}
-@@ -207,6 +307,10 @@
- {$define GDB_INIT_HAS_ARGV0}
- {$endif GDB_V6}
-
-+{$ifdef GDB_VERSION_RECOGNIZED}
-+ {$warning no recognized GDB_VXYZ conditional found, linking might fail. }
-+{$endif}
-+
-
- {$ifdef GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED}
- {$define DO_NOT_USE_CBPH}
-@@ -426,9 +530,9 @@
- {$ifdef NotImplemented}
- {$undef NotImplemented}
- {$LINKLIB libgdb.a}
-- {$ifdef GDB_HAS_SIM}
-- {$LINKLIB libsim.a}
-- {$endif GDB_HAS_SIM}
-+ {$ifdef GDB_HAS_SIM}
-+ {$LINKLIB libsim.a}
-+ {$endif GDB_HAS_SIM}
- {$LINKLIB libbfd.a}
- {$LINKLIB libreadline.a}
- {$LINKLIB libopcodes.a}
-@@ -552,6 +656,11 @@
- {$LINKLIB gcc}
- {$endif beos}
-
-+{$ifdef aix}
-+ { AIX linker requires more precise external/public separation }
-+ {$define NEED_EXTERNAL_CVAR}
-+ {$undef NotImplemented}
-+{$endif aix}
-
- {$ifdef go32v2}
- {$define supportexceptions}
-@@ -631,6 +740,9 @@
- {$ifdef GDB_V6}
- ui_file_read_ftype = function (stream : pui_file; buffer : pchar; len : longint):longint;cdecl;
- {$endif}
-+ {$ifdef GDB_UI_FILE_HAS_FSEEK}
-+ ui_file_fseek_ftype = function (stream : pui_file; offset : longint{clong}; whence : longint {cint}) : longint{cint};cdecl;
-+ {$endif GDB_UI_FILE_HAS_FSEEK}
-
- ui_file = record
- magic : plongint;
-@@ -647,6 +759,9 @@
- to_isatty : ui_file_isatty_ftype;
- to_rewind : ui_file_rewind_ftype;
- to_put : ui_file_put_ftype;
-+ {$ifdef GDB_UI_FILE_HAS_FSEEK}
-+ to_fseek : ui_file_fseek_ftype;
-+ {$endif GDB_UI_FILE_HAS_FSEEK}
- to_data : pointer;
- end;
-
-@@ -822,6 +937,8 @@
- var
- cli_uiout : ui_out;cvar;external;
- current_uiout : ui_out;cvar;external;
-+ { out local copy for catch_exceptions call }
-+ our_uiout : ui_out;
- {$endif GDB_NO_UIOUT}
- function cli_out_new (stream : pui_file):ui_out;cdecl;external;
- {$endif GDB_V6}
-@@ -960,7 +1077,7 @@
- pprogram_space = pointer;
- pgdbarch = pointer;
-
--{$PACKRECORDS 4}
-+{$PACKRECORDS C}
- pbreakpoint = ^breakpoint;
- breakpoint = record
- {$ifdef GDB_USES_BP_OPS}
-@@ -984,8 +1101,10 @@
- {$ifdef GDB_USES_BP_OPS}
- display_canonical: byte;
- {$endif GDB_USES_BP_OPS}
--
- ignore_count : longint;
-+{$ifdef GDB_BP_HAS_ENABLE_COUNT}
-+ enable_count : longint;
-+{$endif GDB_BP_HAS_ENABLE_COUNT}
- {$ifndef GDB_USES_BP_LOCATION}
- shadow_contents : array[0..15] of char;
- inserted : char;
-@@ -1021,6 +1140,9 @@
- section : pointer; {^asection}
- end;
-
-+ pagent_expr = pointer;
-+ tcondition_status = (condition_unchanged, condition_modified);
-+
- bp_target_info = record
- placed_address_space : pointer;{paddress_space;}
- placed_address : CORE_ADDR;
-@@ -1049,6 +1171,12 @@
- owner : pbreakpoint;
- {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
- cond : pointer;{pexpression;}
-+{$ifdef GDB_BP_LOCATION_HAS_COND_BYTECODE}
-+ cond_bytecode : pagent_expr;
-+ condition_changed : tcondition_status;
-+ cmd_bytecode : pagent_expr;
-+ needs_update : byte;
-+{$endif}
- shlib_disabled : byte;
- enabled : byte;
- {$endif GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
-@@ -1067,6 +1195,10 @@
- {$endif GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
- section : pointer;{pobj_section;}
- requested_address : CORE_ADDR;
-+{$ifdef GDB_BP_LOCATION_HAS_RELATED_ADDRESS}
-+ related_address : CORE_ADDR;
-+ probe : pointer; { struct probe *probe; }
-+{$endif}
- {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
- function_name : ^char;
- {$endif GDB_BP_LOCATION_HAS_GLOBAL_NEXT}
-@@ -1121,6 +1253,10 @@
- avoid stack memory corruption PM }
- explicit_pc : longint;
- explicit_line : longint;
-+ { New field added in GDB 7.5 version }
-+ probe : pointer;{struct probe *probe; }
-+ { New field added in GDB 7.8? version }
-+ objfile : pointer; { struct objfile * }
- end;
-
- symtabs_and_lines = record
-@@ -1566,7 +1702,7 @@
- to_magic : longint;
- end;
-
--{$PACKRECORDS NORMAL}
-+{$PACKRECORDS C}
-
- {*****************************************************************************
- Define external calls to libgdb.a
-@@ -1576,7 +1712,8 @@
- { external variables }
- error_return : jmp_buf;cvar;public;
- quit_return : jmp_buf;cvar;public;
-- deprecated_query_hook : pointer;cvar;public;
-+ deprecated_query_hook : pointer;cvar;
-+{$ifdef NEED_EXTERNAL_CVAR}external;{$else}public;{$endif}
-
- {$ifndef GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED}
- {$ifdef GDB_HAS_DEPRECATED_CBPH}
-@@ -1615,9 +1752,17 @@
- var
- instream : P_C_FILE;cvar;external;
- function gdb_fopen (filename : pchar; mode : pchar) : pui_file;cdecl;external;
-+{$ifdef LIBGDB_HAS_GET_STDIN}
-+ { this function is generated by the gen-libgdb-inc.sh script
-+ in a object called gdb_get_stdin.o added to the libgdb.a archive }
-+ function gdb_get_stdin : P_C_FILE; cdecl; external;
-+var
-+ saved_command_line : pchar;cvar;external; { defined in top.c source }
-+ saved_command_line_size : longint;cvar;external; {defined in top.c source }
-+{$endif}
- {$endif GDB_NEEDS_SET_INSTREAM}
- var
-- { The four following variables are defined in defs.h
-+ { The four following variables are defined in defs.h
- and instanciated in main.c since version 5.0 }
- gdb_stdout : pui_file;cvar;public;
- gdb_stderr : pui_file;cvar;public;
-@@ -1639,7 +1784,11 @@
- { xvasprintf is present at least from GDB 5.3
- while xstrvprintf only appears in version 6.2,
- so only use xvasprintf function }
-+{$ifdef GDB_USE_XSTRVPRINTF}
-+function xstrvprintf(msg : pchar) : pchar; varargs; cdecl; external;
-+{$else}
- function xvasprintf(ret : ppchar; msg : pchar) : pchar; varargs; cdecl; external;
-+{$endif}
- procedure xfree(p : pointer); cdecl; external;
- function find_pc_line(i:CORE_ADDR;l:longint):symtab_and_line;cdecl;external;
- function find_pc_function(i:CORE_ADDR):psymbol;cdecl;external;
-@@ -2021,6 +2170,13 @@
- stop_breakpoint_number:=num;
- end;
-
-+procedure annotate_breakpoints_changed;cdecl;public;
-+begin
-+{$ifdef Verbose}
-+ Debug('|breakpoints_changed|');
-+{$endif}
-+end;
-+
-
- procedure annotate_watchpoint(num:longint);cdecl;public;
- begin
-@@ -2358,6 +2514,14 @@
- {$endif}
- end;
-
-+procedure annotate_display_prompt;cdecl;public;
-+begin
-+{$ifdef Verbose}
-+ Debug('|display_prompt|');
-+{$endif}
-+end;
-+
-+
- procedure annotate_display_begin;cdecl;public;
- begin
- {$ifdef Verbose}
-@@ -2527,7 +2691,11 @@
- QueryHook:=1
- else if pos('%',question)>0 then
- begin
-+{$ifdef GDB_USE_XSTRVPRINTF}
-+ local:=xstrvprintf(question,arg);
-+{$else}
- xvasprintf(@local,question,arg);
-+{$endif}
- { xvasprintf can failed, in that case local is set to nil }
- if not assigned(local) then
- local:=question;
-@@ -2752,6 +2920,16 @@
- var
- top_level_val : longint;
-
-+{$ifdef USE_CATCH_EXCEPTIONS}
-+function catch_exceptions(uiout : ui_out; func : pointer; command : pchar; mask : longint) : longint;cdecl;external;
-+
-+function gdbint_execute_command(uiout : ui_out; command : pchar) : longint;cdecl;
-+begin
-+ gdbint_execute_command:=1;
-+ execute_command(command,1);
-+ gdbint_execute_command:=0;
-+end;
-+{$else not USE_CATCH_EXCEPTIONS}
- function catch_command_errors(func : pointer; command : pchar; from_tty,mask : longint) : longint;cdecl;external;
-
- function gdbint_execute_command(command : pchar; from_tty : longint) : longint;cdecl;
-@@ -2760,6 +2938,7 @@
- execute_command(command,from_tty);
- gdbint_execute_command:=0;
- end;
-+{$endif not USE_CATCH_EXCEPTIONS}
-
- {$ifdef cpui386}
- type
-@@ -2861,8 +3040,12 @@
- begin
- quit_return:=error_return;
- mask:=longint($ffffffff);
-+{$ifdef USE_CATCH_EXCEPTIONS}
-+ catch_exceptions(our_uiout, @gdbint_execute_command, at command,mask);
-+{$else i.e. not USE_CATCH_EXCEPTIONS}
- catch_command_errors(@gdbint_execute_command, at command,
- 1,mask);
-+{$endif not def USE_CATCH_EXCEPTIONS}
- {$ifdef go32v2}
- reload_fs;
- {$endif go32v2}
-@@ -3226,6 +3409,10 @@
- ui_file_delete(gdb_stdin);
- gdb_stdin:=mem_fileopen;
- save_gdb_stdin:=gdb_stdin;
-+{$ifdef LIBGDB_HAS_GET_STDIN}
-+ instream:=gdb_get_stdin;
-+ saved_command_line:=xmalloc(saved_command_line_size);
-+{$else}
- dummy_file :=gdb_fopen('dummy.$$$','a');
- {in captured_main code, this is simply
- instream:=stdin; but stdin is a highly system dependent macro
-@@ -3234,6 +3421,7 @@
- instream:=pstdio_file(dummy_file^.to_data)^._file
- else
- instream:=nil;
++{$ifdef GDB_VER_GE_710}
++ {$define GDB_VER_GE_709}
+{$endif}
- {$endif GDB_NEEDS_SET_INSTREAM}
-
- gdb_stderr:=mem_fileopen;
-@@ -3297,6 +3485,7 @@
- {$ifdef GDB_NO_UIOUT}
- cli_uiout := cli_out_new (gdb_stdout);
- current_uiout:=cli_uiout;
-+ our_uiout:=cli_uiout;
- {$endif GDB_NO_UIOUT}
- {$endif GDB_NEEDS_INTERPRETER_SETUP}
- {$ifdef supportexceptions}
-@@ -3328,10 +3517,10 @@
- variables that are defined in main.c source.
- We must not load main.o otherwise, we will get
- into multiply defined symbols troubles. }
--var
-+var
- gdb_sysrootc : char;
- { used locally only to provide a pchar pointing to '\0' }
-- gdb_sysroot : pchar; cvar;public;
-+ gdb_sysroot : pchar; cvar;public;
- { gdb_sysroot global variable is declared in defs.h and
- instanciated in main.c since version 6.0 }
- gdb_datadir : pchar; cvar;public;
-@@ -3358,6 +3547,15 @@
- debug_file_directory : pchar; cvar; external;
- {$endif GDB_HAS_DEBUG_FILE_DIRECTORY}
-
-+{$ifdef USE_LOCAL_SET_GDB_DATA_DIRECTORY}
-+{ Avoid loading of main.o object by providing a
-+ stripped down version of relocate_gdb_directory function }
-+procedure set_gdb_data_directory(path : pchar); cdecl; public;
-+begin
-+ gdb_datadir:=path;
-+end;
-+{$endif USE_LOCAL_SET_GDB_DATA_DIRECTORY}
+
- begin
- {$ifdef GDB_HAS_SYSROOT}
- gdb_sysrootc := #0;
+ { 7.9.x }
+ {$ifdef GDB_V709}
+ {$info using gdb 7.9.x}
diff --git a/fpc-r22920.patch b/fpc-r22920.patch
deleted file mode 100644
index 33aab9d..0000000
--- a/fpc-r22920.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fpcsrc/compiler/msg/errore.msg_ 2012-11-03 18:11:32.766841639 +0100
-+++ fpcsrc/compiler/msg/errore.msg 2012-11-03 18:12:02.071528768 +0100
-@@ -2939,7 +2939,7 @@
- % Mac OS X only DWARF debug information can be stored externally.
- option_invalid_macosx_deployment_target=11049_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variable: $1
- option_invalid_iphoneos_deployment_target=11050_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment variable: $1
--% On Mac OS X, the MACOSX_DEPLOYMENT_TARGET/IPHONEOS_DEPLOYMENT_TARGET environment variable can be
-+% On Mac OS X, the MACOSX\_DEPLOYMENT\_TARGET/IPHONEOS\_DEPLOYMENT\_TARGET environment variable can be
- % used to set the default target OS version. In case of Mac OS X, it has to be of the format
- % XY.Z or XY.Z.AB with X, Y,Z , A and B all digits from 0-9.
- % In case of iOS, it has to be X.Z.A, where X, Z and A can all be either 1 or 2
diff --git a/fpc-r32374.patch b/fpc-r32374.patch
new file mode 100644
index 0000000..6207206
--- /dev/null
+++ b/fpc-r32374.patch
@@ -0,0 +1,225 @@
+Index: utils/fpdoc/dw_html.pp
+===================================================================
+--- fpcsrc/utils/fpdoc/dw_html.pp (revision 32373)
++++ fpcsrc/utils/fpdoc/dw_html.pp (revision 32374)
+@@ -2471,7 +2471,7 @@
+ try
+ B.BuildTree(AList);
+ // Classes
+- WriteXMLFile(B.ClassTree,'tree.xml');
++ // WriteXMLFile(B.ClassTree,'tree.xml');
+ // Dummy TObject
+ E:=B.ClassTree.DocumentElement;
+ PushClassList;
+Index: utils/fpdoc/mkfpdoc.pp
+===================================================================
+--- fpcsrc/utils/fpdoc/mkfpdoc.pp (revision 32373)
++++ fpcsrc/utils/fpdoc/mkfpdoc.pp (revision 32374)
+@@ -19,6 +19,8 @@
+
+ TFPDocCreator = Class(TComponent)
+ Private
++ FBaseDescrDir: String;
++ FBaseInputDir: String;
+ FCurPackage : TFPDocPackage;
+ FProcessedUnits : TStrings;
+ FOnLog: TPasParserLogHandler;
+@@ -28,7 +30,11 @@
+ FVerbose: Boolean;
+ function GetOptions: TEngineOptions;
+ function GetPackages: TFPDocPackages;
++ procedure SetBaseDescrDir(AValue: String);
++ procedure SetBaseInputDir(AValue: String);
+ Protected
++ Function FixInputFile(Const AFileName : String) : String;
++ Function FixDescrFile(Const AFileName : String) : String;
+ Procedure DoBeforeEmitNote(Sender : TObject; Note : TDomElement; Var EmitNote : Boolean); virtual;
+ procedure HandleOnParseUnit(Sender: TObject; const AUnitName: String; out AInputFile, OSTarget, CPUTarget: String);
+ procedure SetVerbose(AValue: Boolean); virtual;
+@@ -49,6 +55,9 @@
+ // Easy access
+ Property Options : TEngineOptions Read GetOptions;
+ Property Packages : TFPDocPackages Read GetPackages;
++ // When set, they will be prepended to non-absolute filenames.
++ Property BaseInputDir : String Read FBaseInputDir Write SetBaseInputDir;
++ Property BaseDescrDir : String Read FBaseDescrDir Write SetBaseDescrDir;
+ end;
+
+ implementation
+@@ -72,13 +81,13 @@
+ end;
+ end;
+
+-procedure TFPDocCreator.DoLog(const Msg: String);
++Procedure TFPDocCreator.DoLog(Const Msg: String);
+ begin
+ If Assigned(OnLog) then
+ OnLog(Self,Msg);
+ end;
+
+-procedure TFPDocCreator.DoLog(const Fmt: String; Args: array of const);
++procedure TFPDocCreator.DoLog(Const Fmt: String; Args: Array of Const);
+ begin
+ DoLog(Format(Fmt,Args));
+ end;
+@@ -103,7 +112,7 @@
+ SplitInputFIleOption(S,UN,Opts);
+ if CompareText(ChangeFileExt(ExtractFileName(Un),''),AUnitName)=0 then
+ begin
+- AInputFile:=S;
++ AInputFile:=FixInputFile(UN)+' '+Opts;
+ OSTarget:=FProject.Options.OSTarget;
+ CPUTarget:=FProject.Options.CPUTarget;
+ FProcessedUnits.Add(UN);
+@@ -123,13 +132,45 @@
+ Result:=FProject.Packages;
+ end;
+
+-procedure TFPDocCreator.DoBeforeEmitNote(Sender: TObject; Note: TDomElement;
+- var EmitNote: Boolean);
++Function TFPDocCreator.FixInputFile(Const AFileName: String): String;
+ begin
++ Result:=AFileName;
++ If Result='' then exit;
++ if (ExtractFileDrive(Result)='') and (Result[1]<>PathDelim) then
++ Result:=BaseInputDir+Result;
++end;
++
++Function TFPDocCreator.FixDescrFile(Const AFileName: String): String;
++begin
++ Result:=AFileName;
++ If Result='' then exit;
++ if (ExtractFileDrive(Result)='') and (Result[1]<>PathDelim) then
++ Result:=BaseDescrDir+Result;
++end;
++
++procedure TFPDocCreator.SetBaseDescrDir(AValue: String);
++begin
++ if FBaseDescrDir=AValue then Exit;
++ FBaseDescrDir:=AValue;
++ If FBaseDescrDir<>'' then
++ FBaseDescrDir:=IncludeTrailingPathDelimiter(FBaseDescrDir);
++end;
++
++procedure TFPDocCreator.SetBaseInputDir(AValue: String);
++begin
++ if FBaseInputDir=AValue then Exit;
++ FBaseInputDir:=AValue;
++ If FBaseInputDir<>'' then
++ FBaseInputDir:=IncludeTrailingPathDelimiter(FBaseInputDir);
++end;
++
++Procedure TFPDocCreator.DoBeforeEmitNote(Sender: TObject; Note: TDomElement;
++ Var EmitNote: Boolean);
++begin
+ EmitNote:=True;
+ end;
+
+-constructor TFPDocCreator.Create(AOwner: TComponent);
++Constructor TFPDocCreator.Create(AOwner: TComponent);
+ begin
+ inherited Create(AOwner);
+ FProject:=TFPDocProject.Create(Self);
+@@ -139,7 +180,7 @@
+ FProcessedUnits:=TStringList.Create;
+ end;
+
+-destructor TFPDocCreator.Destroy;
++Destructor TFPDocCreator.Destroy;
+ begin
+ FreeAndNil(FProcessedUnits);
+ FreeAndNil(FProject);
+@@ -180,7 +221,8 @@
+ Engine.WriteContentFile(APackage.ContentFile);
+ end;
+
+-procedure TFPDocCreator.CreateDocumentation(APackage: TFPDocPackage; ParseOnly : Boolean);
++Procedure TFPDocCreator.CreateDocumentation(APackage: TFPDocPackage;
++ ParseOnly: Boolean);
+
+ var
+ i,j: Integer;
+@@ -201,7 +243,7 @@
+ Engine.ReadContentFile(Arg, Cmd);
+ end;
+ for i := 0 to APackage.Descriptions.Count - 1 do
+- Engine.AddDocFile(APackage.Descriptions[i],Options.donttrim);
++ Engine.AddDocFile(FixDescrFile(APackage.Descriptions[i]),Options.donttrim);
+ Engine.SetPackageName(APackage.Name);
+ Engine.Output:=APackage.Output;
+ Engine.OnLog:=Self.OnLog;
+@@ -216,10 +258,11 @@
+ for i := 0 to APackage.Inputs.Count - 1 do
+ try
+ SplitInputFileOption(APackage.Inputs[i],Cmd,Arg);
++ Cmd:=FixInputFIle(Cmd);
+ if FProcessedUnits.IndexOf(Cmd)=-1 then
+ begin
+ FProcessedUnits.Add(Cmd);
+- ParseSource(Engine, APackage.Inputs[i], Options.OSTarget, Options.CPUTarget);
++ ParseSource(Engine,Cmd+' '+Arg, Options.OSTarget, Options.CPUTarget);
+ end;
+ except
+ on e: EParserError do
+@@ -239,7 +282,7 @@
+ end;
+ end;
+
+-procedure TFPDocCreator.CreateProjectFile(Const AFileName: string);
++Procedure TFPDocCreator.CreateProjectFile(Const AFileName: string);
+ begin
+ With TXMLFPDocOptions.Create(Self) do
+ try
+@@ -249,7 +292,7 @@
+ end;
+ end;
+
+-procedure TFPDocCreator.LoadProjectFile(const AFileName: string);
++Procedure TFPDocCreator.LoadProjectFile(Const AFileName: string);
+ begin
+ With TXMLFPDocOptions.Create(self) do
+ try
+Index: utils/fpdoc/fpdoc.pp
+===================================================================
+--- fpcsrc/utils/fpdoc/fpdoc.pp (revision 32373)
++++ fpcsrc/utils/fpdoc/fpdoc.pp (revision 32374)
+@@ -73,6 +73,8 @@
+
+ begin
+ Writeln(Format(SCmdLineHelp,[ExtractFileName(Paramstr(0))]));
++ Writeln(SUsageOption008);
++ Writeln(SUsageOption009);
+ Writeln(SUsageOption010);
+ Writeln(SUsageOption020);
+ Writeln(SUsageOption030);
+@@ -311,6 +313,8 @@
+ AddToFileList(SelectedPackage.Descriptions, Arg)
+ else if (Cmd = '--descr-dir') then
+ AddDirToFileList(SelectedPackage.Descriptions, Arg, '*.xml')
++ else if (Cmd = '--base-descr-dir') then
++ FCreator.BaseDescrDir:=Arg
+ else if (Cmd = '-f') or (Cmd = '--format') then
+ begin
+ Arg:=UpperCase(Arg);
+@@ -323,6 +327,8 @@
+ FCreator.Options.Language := Arg
+ else if (Cmd = '-i') or (Cmd = '--input') then
+ AddToFileList(SelectedPackage.Inputs, Arg)
++ else if (Cmd = '--base-input-dir') then
++ FCreator.BaseInputDir:=Arg
+ else if (Cmd = '--input-dir') then
+ begin
+ AddDirToFileList(SelectedPackage.Inputs, Arg,'*.pp');
+Index: utils/fpdoc/dglobals.pp
+===================================================================
+--- fpcsrc/utils/fpdoc/dglobals.pp (revision 32373)
++++ fpcsrc/utils/fpdoc/dglobals.pp (revision 32374)
+@@ -142,6 +142,8 @@
+ SCopyright2 = '(c) 2005 - 2012 various FPC contributors';
+
+ SCmdLineHelp = 'Usage: %s [options]';
++ SUsageOption008 = '--base-descr-dir=DIR prefix all description files with this directory';
++ SUsageOption009 = '--base-input-dir=DIR prefix all input files with this directory';
+ SUsageOption010 = '--content Create content file for package cross-references';
+ SUsageOption020 = '--cputarget=value Set the target CPU for the scanner.';
+ SUsageOption030 = '--descr=file use file as description file, e.g.: ';
diff --git a/fpcdocs-r1260.patch b/fpcdocs-r1260.patch
new file mode 100644
index 0000000..59a5ede
--- /dev/null
+++ b/fpcdocs-r1260.patch
@@ -0,0 +1,33 @@
+Index: fpcdocs/Makefile
+===================================================================
+--- fpcdocs/Makefile (revision 1259)
++++ fpcdocs/Makefile (working copy)
+@@ -2672,9 +2672,9 @@
+ $(RTLMAKESKEL) $(RTLCHARACTER) --output=character.new.xml
+ ./cleanxml $(RTLNEWXML)
+ rtl.inc: $(RTLXML)
+- $(FPDOC) --output=rtl.inc --project=rtl-project.xml --format=latex
++ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/rtl --output=rtl.inc --project=rtl-project.xml --format=latex
+ fcl.inc: $(FCLXML)
+- $(FPDOC) --output=fcl.inc --project=fcl-project.xml --format=latex
++ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/packages --output=fcl.inc --project=fcl-project.xml --format=latex
+ fclres.inc: $(FCLRESXML)
+ $(FPDOC) --output=fclres.inc $(FCLRESOPTS) --format=latex
+ RTFFILES = $(addsuffix .rtf,$(RTFS))
+Index: fpcdocs/Makefile.fpc
+===================================================================
+--- fpcdocs/Makefile.fpc (revision 1258)
++++ fpcdocs/Makefile.fpc (working copy)
+@@ -777,10 +777,10 @@
+ #####################################################################
+
+ rtl.inc: $(RTLXML)
+- $(FPDOC) --output=rtl.inc --project=rtl-project.xml --format=latex
++ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/rtl --output=rtl.inc --project=rtl-project.xml --format=latex
+
+ fcl.inc: $(FCLXML)
+- $(FPDOC) --output=fcl.inc --project=fcl-project.xml --format=latex
++ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/packages --output=fcl.inc --project=fcl-project.xml --format=latex
+
+ fclres.inc: $(FCLRESXML)
+ $(FPDOC) --output=fclres.inc $(FCLRESOPTS) --format=latex
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fpc.git/commitdiff/1ac879dafd5c5b503351f0c6bf17a22e09ad1d16
More information about the pld-cvs-commit
mailing list