Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Sep 2018 16:08:01 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480035 - in head/lang: php56 php70 php71 php72
Message-ID:  <201809181608.w8IG81C2008142@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste (src committer)
Date: Tue Sep 18 16:08:00 2018
New Revision: 480035
URL: https://svnweb.freebsd.org/changeset/ports/480035

Log:
  lang/php*: link with -znotext on i386
  
  This port links some non-PIC code, which fails with lld as it defaults
  to disallowing relocations against read-only segments. For i386 we can
  just add -znotext unconditionally: for GNU BFD ld it just affirms BFD's
  existing default.
  
  PR:		214864, 230207
  Approved by:	bapt
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D17193

Modified:
  head/lang/php56/Makefile
  head/lang/php70/Makefile
  head/lang/php71/Makefile
  head/lang/php72/Makefile

Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile	Tue Sep 18 16:06:56 2018	(r480034)
+++ head/lang/php56/Makefile	Tue Sep 18 16:08:00 2018	(r480035)
@@ -32,6 +32,9 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USES+=		autoreconf:build
 USE_GNOME=	libxml2
 
+# PR230207 Allow relocations against read-only segments (override lld default)
+LDFLAGS_i386=	-Wl,-z,notext
+
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM

Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile	Tue Sep 18 16:06:56 2018	(r480034)
+++ head/lang/php70/Makefile	Tue Sep 18 16:08:00 2018	(r480035)
@@ -31,6 +31,9 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USES+=		autoreconf:build
 USE_GNOME=	libxml2
 
+# PR230207 Allow relocations against read-only segments (override lld default)
+LDFLAGS_i386=	-Wl,-z,notext
+
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE

Modified: head/lang/php71/Makefile
==============================================================================
--- head/lang/php71/Makefile	Tue Sep 18 16:06:56 2018	(r480034)
+++ head/lang/php71/Makefile	Tue Sep 18 16:08:00 2018	(r480035)
@@ -32,6 +32,9 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USES+=		autoreconf:build
 USE_GNOME=	libxml2
 
+# PR230207 Allow relocations against read-only segments (override lld default)
+LDFLAGS_i386=	-Wl,-z,notext
+
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE

Modified: head/lang/php72/Makefile
==============================================================================
--- head/lang/php72/Makefile	Tue Sep 18 16:06:56 2018	(r480034)
+++ head/lang/php72/Makefile	Tue Sep 18 16:08:00 2018	(r480035)
@@ -33,6 +33,9 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USES+=		autoreconf:build
 USE_GNOME=	libxml2
 
+# PR230207 Allow relocations against read-only segments (override lld default)
+LDFLAGS_i386=	-Wl,-z,notext
+
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809181608.w8IG81C2008142>