From owner-svn-ports-head@freebsd.org  Wed Aug  1 18:30:53 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A5731065B82;
 Wed,  1 Aug 2018 18:30:53 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 00B3481708;
 Wed,  1 Aug 2018 18:30:53 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D70392626B;
 Wed,  1 Aug 2018 18:30:52 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w71IUq1b015270;
 Wed, 1 Aug 2018 18:30:52 GMT (envelope-from zeising@FreeBSD.org)
Received: (from zeising@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w71IUq24015269;
 Wed, 1 Aug 2018 18:30:52 GMT (envelope-from zeising@FreeBSD.org)
Message-Id: <201808011830.w71IUq24015269@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zeising set sender to
 zeising@FreeBSD.org using -f
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 1 Aug 2018 18:30:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r476189 - head/graphics/mesa-libs
X-SVN-Group: ports-head
X-SVN-Commit-Author: zeising
X-SVN-Commit-Paths: head/graphics/mesa-libs
X-SVN-Commit-Revision: 476189
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2018 18:30:53 -0000

Author: zeising
Date: Wed Aug  1 18:30:52 2018
New Revision: 476189
URL: https://svnweb.freebsd.org/changeset/ports/476189

Log:
  Fix build with lld linker on i386
  
  Fix the build with the lld linker on i386.  This is done by adding an option
  to the linker to allow relocations in read-only segments, since there are
  some assembler code that's not PIC.
  the gnu ld linker does this by default.
  
  PR:		230239
  Submitted by:	emaste

Modified:
  head/graphics/mesa-libs/Makefile

Modified: head/graphics/mesa-libs/Makefile
==============================================================================
--- head/graphics/mesa-libs/Makefile	Wed Aug  1 18:13:39 2018	(r476188)
+++ head/graphics/mesa-libs/Makefile	Wed Aug  1 18:30:52 2018	(r476189)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
@@ -54,6 +54,11 @@ MESA_INSTALL_WRKSRC+=	src/gbm src/glx
 .if "${MESA_LLVM_VER}" != ""
 MESA_BUILD_WRKSRC+=	src/egl
 MESA_INSTALL_WRKSRC+=	src/egl
+.endif
+
+.if ${ARCH} == "i386"
+# PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
+LDFLAGS+=-Wl,-z,notext
 .endif
 
 .include "${MASTERDIR}/Makefile.targets"