diff options
| author | bsiegert <bsiegert> | 2016-06-28 18:59:07 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2016-06-28 18:59:07 +0000 |
| commit | 0cd1253b264243cf1f2abb0aceb7299d962c4599 (patch) | |
| tree | 120025e71580e3f96628e6b406f906a366a6acf9 | |
| parent | 5760d999492e20df7354d7d8bdf96e5f8562ab5e (diff) | |
| download | pkgsrc-0cd1253b264243cf1f2abb0aceb7299d962c4599.tar.gz | |
Pullup ticket #5042 - requested by joerg
lang/php70: build fix
Revisions pulled up:
- lang/php70/distinfo 1.13
- lang/php70/patches/patch-sapi_cli_Makefile.frag 1.3
---
Module Name: pkgsrc
Committed By: joerg
Date: Tue Jun 7 19:23:50 UTC 2016
Modified Files:
pkgsrc/lang/php70: distinfo
pkgsrc/lang/php70/patches: patch-sapi_cli_Makefile.frag
Log Message:
Unbreak unprivileged build. Actually test for executable.
| -rw-r--r-- | lang/php70/distinfo | 4 | ||||
| -rw-r--r-- | lang/php70/patches/patch-sapi_cli_Makefile.frag | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo index b96cfceea60..09a84f7221f 100644 --- a/lang/php70/distinfo +++ b/lang/php70/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8.2.2 2016/06/04 19:56:36 bsiegert Exp $ +$NetBSD: distinfo,v 1.8.2.3 2016/06/28 18:59:07 bsiegert Exp $ SHA1 (php-7.0.7.tar.bz2) = 7d1d718288e34edce686bd834de5313d199cebd3 RMD160 (php-7.0.7.tar.bz2) = d894c6897095736b5a278ee5a91b9a4cd80b6bac @@ -21,6 +21,6 @@ SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 -SHA1 (patch-sapi_cli_Makefile.frag) = 4ad9e9ad951ac02314b4c262a0a61e9fd275456e +SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 diff --git a/lang/php70/patches/patch-sapi_cli_Makefile.frag b/lang/php70/patches/patch-sapi_cli_Makefile.frag index 4c435612d0e..7edf84e666c 100644 --- a/lang/php70/patches/patch-sapi_cli_Makefile.frag +++ b/lang/php70/patches/patch-sapi_cli_Makefile.frag @@ -1,4 +1,4 @@ -$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2.2.2 2016/06/04 19:56:36 bsiegert Exp $ +$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2.2.3 2016/06/28 18:59:07 bsiegert Exp $ Needed on NetBSD with PaX MPROTEXT, otherwise core dump with: #1 0x00000000004d0d87 in _pcre_jit_exec () @@ -11,8 +11,8 @@ https://bugs.php.net/bug.php?id=72281 $(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) $(BUILD_CLI) -+ @if test -f /usr/sbin/paxctl; then \ -+ paxctl +m $(SAPI_CLI_PATH); \ ++ @if test -x /usr/sbin/paxctl; then \ ++ /usr/sbin/paxctl +m $(SAPI_CLI_PATH); \ + fi install-cli: $(SAPI_CLI_PATH) |