fpc 3.0.4-1 (znver1;x86_64) 2019-6604
9999
| Status | published | ||||||||||
| Submitter | benbullard79 [@T] cox.net | ||||||||||
| Platform | 4.0 | ||||||||||
| Repository | main | ||||||||||
| URL | https://abf.openmandriva.org/build_lists/601312 | ||||||||||
| Packages |
|
||||||||||
| Build Date | 2019-09-12 01:05:37 +0000 UTC | ||||||||||
| Last Updated | 2019-09-26 16:18:16.390676632 +0000 UTC |
$ git show --format=fuller --patch-with-stat --summary 699b2594b205e3512dca702db91e6f302fe516be
commit 699b2594b205e3512dca702db91e6f302fe516be
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Wed Aug 21 00:04:56 2019 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Wed Aug 21 00:04:56 2019 +0200
3.0.4
---
.abf.yml | 8 +++---
fpc.spec | 71 ++++++++++++++++++++++++++++--------------------------
ld-linux-arm.patch | 16 ------------
3 files changed, 41 insertions(+), 54 deletions(-)
delete mode 100644 ld-linux-arm.patch
diff --git a/.abf.yml b/.abf.yml
index a7236b6..e2624d2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,5 +1,5 @@
sources:
- fpc-2.6.4.arm-linux.tar: 8cd23dac18c58a18c6e67f93dbaa0677862bf028
- fpc-2.6.4.i386-linux.tar: 144f81aa8b64a6bca7c78fe87ebea9728b8d8872
- fpc-2.6.4.source.tar.gz: 60eeadf65db25b10b174627457a5799bf0fd0d52
- fpc-2.6.4.x86_64-linux.tar: bfba781eac7177e6bf36522859cc5ca7251d6f5e
+ fpc-3.0.4.i386-linux.tar: 0a51364bd1a37f1e776df5357ab5bfca8cc7ddeb
+ fpc-3.0.4.source.tar.gz: 7b4d214f2de56e5a60cca6b6ab8f192e786894b4
+ fpc-3.0.4.x86_64-linux.tar: 0720e428eaea423423e1b76a7267d6749c3399f4
+ fpc-3.0.2.arm-linux-eabihf-raspberry.tar: 2e301310df0e3e788ecbaf0a4ad1faf7251568d9
diff --git a/fpc.spec b/fpc.spec
index e1ba828..8240b3f 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -11,17 +11,20 @@
%if %{fpc_target} == ppc
%define fpc_target powerpc
%endif
-%if %{fpc_target} == i586
+%if %{fpc_target} == i686
%define fpc_target i386
%endif
%define fpc_short_target %_target_cpu
%if %{fpc_short_target} == x86_64
%define fpc_short_target x64
%endif
-%if %{fpc_short_target} == i586
+%if %{fpc_short_target} == znver1
+%define fpc_short_target x64
+%endif
+%if %{fpc_short_target} == i686
%define fpc_short_target 386
%endif
-%if %{fpc_short_target} == armv7hl
+%if %{fpc_short_target} == armv7hnl
%define fpc_short_target arm
%endif
@@ -39,20 +42,20 @@
Summary: Free Pascal Compiler
Name: fpc
-Version: 2.6.4
-Release: 5
+Version: 3.0.4
+Release: 1
License: GPLv2+ and LGPLv2+ with exceptions
Group: Development/Other
Url: http://www.freepascal.org/
-Source0: http://surfnet.dl.sourceforge.net/sourceforge/freepascal/%{name}-%{version}.source.tar.gz
+Source0: https://downloads.sourceforge.net/project/freepascal/Source/%{version}/fpc-%{version}.source.tar.gz
# Bootstrap compilers
Source10: http://downloads.sourceforge.net/project/freepascal/Linux/%{version}/fpc-%{version}.x86_64-linux.tar
Source11: http://downloads.sourceforge.net/project/freepascal/Linux/%{version}/fpc-%{version}.i386-linux.tar
-Source12: http://downloads.sourceforge.net/project/freepascal/Linux/%{version}/fpc-%{version}.arm-linux.tar
+# For some reason 3.0.4 doesn't have an upstream arm build
+Source12: http://downloads.sourceforge.net/project/freepascal/Linux/3.0.2/fpc-3.0.2.arm-linux-eabihf-raspberry.tar
Source100: %{name}.rpmlintrc
Patch1: fpc-use_bfd_linker.patch
-Patch2: ld-linux-arm.patch
-ExclusiveArch: %{ix86} x86_64 %{arm}
+ExclusiveArch: %{ix86} %{x86_64} %{arm}
Requires: gcc
Requires: fpc-base == %{version}
Requires: fpc-units == %{version}
@@ -167,7 +170,7 @@ NEWFCPMAKE=/usr/bin/fpcmake
%else
EXTRA_FLAGS=
NEWPP=`pwd`/compiler/ppc%{fpc_short_target}
-NEWFCPMAKE=`pwd`//utils/fpcm/fpcmake
+NEWFCPMAKE=`pwd`/utils/fpcm/bin/*/fpcmake
%endif
INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=%{buildroot}/%{_prefix} INSTALL_LIBDIR=%{buildlibdir} \
INSTALL_DOCDIR=%{builddocdir} INSTALL_BINDIR=%{buildbindir}"
@@ -208,19 +211,20 @@ find %{buildroot}%{_datadir}/fpcsrc/ -type f -exec chmod 644 {} \;
%files
%files units
-%{_prefix}/lib/fpc/%{version}/units
+%{_libdir}/fpc/%{version}/units
+%{_libdir}/fpc/%{version}/fpmkinst
# in fpc-base
-%ifarch i586
-%exclude %{_prefix}/lib/fpc/%{version}/units/i386-linux/rtl
-%exclude %{_prefix}/lib/fpc/%{version}/units/i386-linux/x11
-%exclude %{_prefix}/lib/fpc/%{version}/units/i386-linux/ncurses
-%exclude %{_prefix}/lib/fpc/%{version}/units/i386-linux/zlib
+%ifarch %{ix86}
+%exclude %{_libdir}/fpc/%{version}/units/i386-linux/rtl
+%exclude %{_libdir}/fpc/%{version}/units/i386-linux/x11
+%exclude %{_libdir}/fpc/%{version}/units/i386-linux/ncurses
+%exclude %{_libdir}/fpc/%{version}/units/i386-linux/zlib
%endif
-%ifarch x86_64
-%exclude %{_prefix}/lib/fpc/%{version}/units/x86_64-linux/rtl
-%exclude %{_prefix}/lib/fpc/%{version}/units/x86_64-linux/x11
-%exclude %{_prefix}/lib/fpc/%{version}/units/x86_64-linux/ncurses
-%exclude %{_prefix}/lib/fpc/%{version}/units/x86_64-linux/zlib
+%ifarch %{x86_64}
+%exclude %{_libdir}/fpc/%{version}/units/x86_64-linux/rtl
+%exclude %{_libdir}/fpc/%{version}/units/x86_64-linux/x11
+%exclude %{_libdir}/fpc/%{version}/units/x86_64-linux/ncurses
+%exclude %{_libdir}/fpc/%{version}/units/x86_64-linux/zlib
%endif
%files src
@@ -230,23 +234,22 @@ find %{buildroot}%{_datadir}/fpcsrc/ -type f -exec chmod 644 {} \;
%doc %{_defaultdocdir}/%{name}-%{version}
%{_bindir}/*
%{_prefix}/lib/fpc/lexyacc
-%{_prefix}/lib/fpc/%{version}/ide
%{_prefix}/lib/fpc/%{version}/msg
%{_prefix}/lib/fpc/%{version}/samplecfg
-%ifarch i586
-%{_prefix}/lib/fpc/%{version}/units/i386-linux/rtl
-%{_prefix}/lib/fpc/%{version}/units/i386-linux/x11
-%{_prefix}/lib/fpc/%{version}/units/i386-linux/ncurses
-%{_prefix}/lib/fpc/%{version}/units/i386-linux/zlib
-%{_prefix}/lib/fpc/%{version}/ppc386
-%endif
-%ifarch x86_64
+%ifarch %{ix86}
+%{_libdir}/fpc/%{version}/units/i386-linux/rtl
+%{_libdir}/fpc/%{version}/units/i386-linux/x11
+%{_libdir}/fpc/%{version}/units/i386-linux/ncurses
+%{_libdir}/fpc/%{version}/units/i386-linux/zlib
+%{_libdir}/fpc/%{version}/ppc386
+%endif
+%ifarch %{x86_64}
%{_prefix}/lib/fpc/%{version}/units/x86_64-linux/rtl
-%{_prefix}/lib/fpc/%{version}/units/x86_64-linux/x11
-%{_prefix}/lib/fpc/%{version}/units/x86_64-linux/ncurses
-%{_prefix}/lib/fpc/%{version}/units/x86_64-linux/zlib
+%{_libdir}/fpc/%{version}/units/x86_64-linux/x11
+%{_libdir}/fpc/%{version}/units/x86_64-linux/ncurses
+%{_libdir}/fpc/%{version}/units/x86_64-linux/zlib
%{_prefix}/lib/fpc/%{version}/ppcx64
%endif
%ifarch %arm
-%{_prefix}/lib/fpc/%{version}/ppcarm
+%{_libdir}/fpc/%{version}/ppcarm
%endif
diff --git a/ld-linux-arm.patch b/ld-linux-arm.patch
deleted file mode 100644
index b6e794a..0000000
--- a/ld-linux-arm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/compiler/systems/t_linux.pas b/compiler/systems/t_linux.pas
-index 2b53351..a42ddbf 100644
---- a/compiler/systems/t_linux.pas
-+++ b/compiler/systems/t_linux.pas
-@@ -186,9 +186,9 @@ begin
-
- {$ifdef arm}
- {$ifdef FPC_ARMEL}
-- defdynlinker:='/lib/ld-linux.so.3';
-+ defdynlinker:='/lib/ld-linux-armhf.so.3';
- {$else FPC_ARMEL}
-- defdynlinker:='/lib/ld-linux.so.2';
-+ defdynlinker:='/lib/ld-linux-armhf.so.3';
- {$endif FPC_ARMEL}
- {$endif arm}
-
Not Available
| benbullard79 [@T] cox.net | fpc packages were missing from 4.0 repository. They worked OK in Rolling. | 2247d 00hrs |
| benbullard79 [@T] cox.net | No Comment. | 2244d 04hrs |
| benbullard79 [@T] cox.net | It is time | 2232d 09hrs |
| benbullard79 [@T] cox.net | No Comment. | 2232d 09hrs |