aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2018-12-22 10:34:00 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2018-12-22 17:14:51 +0100
commite5882cddca2fc293fc4f74b15fa591b45ed682ad (patch)
treec574429d16126bfa96e70d3aaa11d05577ba96e9
parent927799ebf6041db8263b212a21e30a540e598252 (diff)
downloadpaludis-e5882cddca2fc293fc4f74b15fa591b45ed682ad.tar.gz
paludis-e5882cddca2fc293fc4f74b15fa591b45ed682ad.tar.xz
build: Work around gcc6&cmake issue #16291 in .gitlab-ci.yaml
A change in gcc 6 made using -isystem with the default include directory fail. A bug report [1] about this has been closed with RESOLVED WONTFIX. This became a problem with cmake[>=3.6] because cmake is filtering out /usr/include as default include path, but not our non-standard /usr/${CHOST}/include (upstream issue [2]). Until this is fixed we can specify the implicit include dir manually. We do the same on Exherbo in cmake.exlib. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 [2] https://gitlab.kitware.com/cmake/cmake/issues/16291 [3] c077952471b7d8003fb3c41091c2daea01e4f700 in arbor.git
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd65560..67a7cb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ build:
script:
- mkdir build
- cd build
- - cmake -DENABLE_GTEST:BOOL=TRUE -DENABLE_PBINS:BOOL=TRUE -DENABLE_PYTHON:BOOL=TRUE -DENABLE_RUBY:BOOL=TRUE -DENABLE_SEARCH_INDEX:BOOL=TRUE -DENABLE_VIM:BOOL=TRUE -DENABLE_XML:BOOL=TRUE -DPALUDIS_CLIENTS=cave -DPALUDIS_ENVIRONMENTS="default;test" -DPALUDIS_REPOSITORIES="default;accounts;gemcutter;repository" -DPALUDIS_DEFAULT_DISTRIBUTION=exherbo -DCONFIG_FRAMEWORK=eclectic ..
+ - cmake -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH='/usr/x86_64-pc-linux-gnu/include;/usr/host/include' -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='/usr/x86_64-pc-linux-gnu/include;/usr/host/include' -DENABLE_GTEST:BOOL=TRUE -DENABLE_PBINS:BOOL=TRUE -DENABLE_PYTHON:BOOL=TRUE -DENABLE_RUBY:BOOL=TRUE -DENABLE_SEARCH_INDEX:BOOL=TRUE -DENABLE_VIM:BOOL=TRUE -DENABLE_XML:BOOL=TRUE -DPALUDIS_CLIENTS=cave -DPALUDIS_ENVIRONMENTS="default;test" -DPALUDIS_REPOSITORIES="default;accounts;gemcutter;repository" -DPALUDIS_DEFAULT_DISTRIBUTION=exherbo -DCONFIG_FRAMEWORK=eclectic ..
- make -j$(nproc)
- make ARGS="--verbose" test
- make install DESTDIR=../install