jenkins-bot has submitted this change and it was merged.
Change subject: Workaround hphpize injecting some bad include path
......................................................................
Workaround hphpize injecting some bad include path
After running cmake ., the CMakeLists.txt file has something like:
set(HHVM_INCLUDE_DIRS;<snip>;/root/joe/hhvm)
That causes the build to abort with:
cc1plus: error: /root/hhvm/joe/hhvm: Permission denied
The workaround for Jenkins is to use sed to strip the invalid path
entirely.
Bug: 68944
Change-Id: I126e135b75253e3b7fd75afe3737086ebcca4f00
---
M php-extensions.yaml
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/php-extensions.yaml b/php-extensions.yaml
index 5d254e4..0a3d17f 100644
--- a/php-extensions.yaml
+++ b/php-extensions.yaml
@@ -14,8 +14,16 @@
triggers:
- zuul
builders:
+ # The sed line below fix up hphpize injected $CWD at time of build to
+ # HHVM_INCLUDE_DIRS causing the build to fail with:
+ #
+ # cc1plus: error: /root/hhvm/joe/hhvm: Permission denied
+ #
+ # https://bugzilla.wikimedia.org/68944
+ #
- shell: |
hphpize
+ sed -i 's%;/root/hhvm/joe/hhvm%%' CMakeLists.txt
cmake .
make
--
To view, visit https://gerrit.wikimedia.org/r/150895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I126e135b75253e3b7fd75afe3737086ebcca4f00
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
