mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
- Fix static linking issues on amd64
- Bump PORTREVISION
This commit is contained in:
parent
3123d104e6
commit
c597c9a763
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=329012
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
PORTNAME= fpc
|
PORTNAME= fpc
|
||||||
PORTVERSION= 2.6.2
|
PORTVERSION= 2.6.2
|
||||||
PORTREVISION?= 2
|
PORTREVISION?= 3
|
||||||
CATEGORIES?= lang
|
CATEGORIES?= lang
|
||||||
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
|
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
|
||||||
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
|
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
|
||||||
|
36
lang/fpc/files/patch-compiler-systems-t_bsd.pas
Normal file
36
lang/fpc/files/patch-compiler-systems-t_bsd.pas
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
--- compiler/systems/t_bsd.pas 2012-04-22 14:47:06.000000000 -0500
|
||||||
|
+++ compiler/systems/t_bsd.pas 2013-10-01 21:07:10.000000000 -0500
|
||||||
|
@@ -484,10 +484,19 @@
|
||||||
|
if linklibc and
|
||||||
|
not IsDarwin Then
|
||||||
|
begin
|
||||||
|
- if librarysearchpath.FindFile('crtbegin.o',false,s) then
|
||||||
|
- LinkRes.AddFileName(s);
|
||||||
|
if librarysearchpath.FindFile('crti.o',false,s) then
|
||||||
|
LinkRes.AddFileName(s);
|
||||||
|
+ if cs_create_pic in current_settings.moduleswitches then
|
||||||
|
+ begin
|
||||||
|
+ if librarysearchpath.FindFile('crtbeginS.o',false,s) then
|
||||||
|
+ LinkRes.AddFileName(s);
|
||||||
|
+ end
|
||||||
|
+ else
|
||||||
|
+ if (cs_link_staticflag in current_settings.globalswitches) and
|
||||||
|
+ librarysearchpath.FindFile('crtbeginT.o',false,s) then
|
||||||
|
+ LinkRes.AddFileName(s)
|
||||||
|
+ else if librarysearchpath.FindFile('crtbegin.o',false,s) then
|
||||||
|
+ LinkRes.AddFileName(s);
|
||||||
|
end;
|
||||||
|
{ main objectfiles }
|
||||||
|
while not ObjectFiles.Empty do
|
||||||
|
@@ -572,7 +581,10 @@
|
||||||
|
if linklibc and
|
||||||
|
not IsDarwin Then
|
||||||
|
begin
|
||||||
|
- Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
|
||||||
|
+ if cs_create_pic in current_settings.moduleswitches then
|
||||||
|
+ Fl1:=librarysearchpath.FindFile('crtendS.o',false,s1)
|
||||||
|
+ else
|
||||||
|
+ Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
|
||||||
|
Fl2:=librarysearchpath.FindFile('crtn.o',false,s2);
|
||||||
|
if Fl1 or Fl2 then
|
||||||
|
begin
|
Loading…
Reference in New Issue
Block a user