From owner-svn-ports-all@freebsd.org Tue Sep 18 16:08:02 2018 Return-Path: Delivered-To: svn-ports-all@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 457D210A216D; Tue, 18 Sep 2018 16:08:02 +0000 (UTC) (envelope-from emaste@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 EF60376A0F; Tue, 18 Sep 2018 16:08:01 +0000 (UTC) (envelope-from emaste@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 EA3C32230E; Tue, 18 Sep 2018 16:08:01 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8IG81no008145; Tue, 18 Sep 2018 16:08:01 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8IG81C2008142; Tue, 18 Sep 2018 16:08:01 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201809181608.w8IG81C2008142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 18 Sep 2018 16:08:01 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/lang: php56 php70 php71 php72 X-SVN-Commit-Revision: 480035 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 16:08:02 -0000 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