Date: Wed, 2 Oct 2013 02:44:06 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329012 - in head/lang/fpc: . files Message-ID: <201310020244.r922i67Z066798@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Wed Oct 2 02:44:05 2013 New Revision: 329012 URL: http://svnweb.freebsd.org/changeset/ports/329012 Log: - Fix static linking issues on amd64 - Bump PORTREVISION Added: head/lang/fpc/files/patch-compiler-systems-t_bsd.pas (contents, props changed) Modified: head/lang/fpc/Makefile Modified: head/lang/fpc/Makefile ============================================================================== --- head/lang/fpc/Makefile Wed Oct 2 02:04:16 2013 (r329011) +++ head/lang/fpc/Makefile Wed Oct 2 02:44:05 2013 (r329012) @@ -3,7 +3,7 @@ PORTNAME= fpc PORTVERSION= 2.6.2 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \ Added: head/lang/fpc/files/patch-compiler-systems-t_bsd.pas ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/fpc/files/patch-compiler-systems-t_bsd.pas Wed Oct 2 02:44:05 2013 (r329012) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310020244.r922i67Z066798>