Attachment 190268 Details for Bug 217582 – Fix FPC build when LLD is the system linker.

[patch] Fix FPC build when LLD is the system linker.

fix-fpc.patch (text/plain), 1.23 KB, created by Dan McGregor on 2018-02-02 15:25:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan McGregor

Created: 2018-02-02 15:25:18 UTC

Size: 1.23 KB

patch

obsolete

>From 84e9d9c901f804b6dc85471fc70646e959b8bf15 Mon Sep 17 00:00:00 2001
>From: Dan McGregor <dan.mcgregor@usask.ca>
>Date: Thu, 1 Feb 2018 14:25:54 -0600
>Subject: [PATCH] FPC is LLD unsafe.
>
>It also needs to append to PLIST_SUB rather than overwrite it, otherwise
>it breaks some packages that depend on PORTDOCS working.
>---
> lang/fpc/Makefile | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git lang/fpc/Makefile lang/fpc/Makefile
>index 6ae4deea2375..202d0ef68185 100644
>--- lang/fpc/Makefile
>+++ lang/fpc/Makefile
>@@ -21,6 +21,12 @@ DIST_SUBDIR=	freepascal
> MAINTAINER?=	acm@FreeBSD.org
> COMMENT?=	Free Pascal compiler with Turbo and Delphi
> 
>+# lld gives "invalid alignment of section headers"
>+LLD_UNSAFE=	yes
>+# Need this because fpc just uses the first "ld" it
>+# finds in the path.
>+BINARY_ALIAS=	ld=ld.bfd
>+
> USES=		gmake iconv
> ONLY_FOR_ARCHS=	i386 amd64
> BOOTVER=	3.0.4
>@@ -36,12 +42,12 @@ FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
> .if ${ARCH} == "i386"
> PPNAME=		ppc386
> FPC_ARCH=	i386
>-PLIST_SUB=	FPC_I386="" \
>+PLIST_SUB+=	FPC_I386="" \
> 		FPC_AMD64="@comment "
> .elif ${ARCH} == "amd64"
> PPNAME=		ppcx64
> FPC_ARCH=	x86_64
>-PLIST_SUB=	FPC_I386="@comment " \
>+PLIST_SUB+=	FPC_I386="@comment " \
> 		FPC_AMD64=""
> .endif
> 
>-- 
>2.16.1
>

Actions: View | Diff

Attachments on bug 217582: 190268