Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use C++17 in O2 #1293

Merged
merged 9 commits into from
Oct 4, 2018
Merged

Use C++17 in O2 #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
57e14d3
Use C++17 in O2
Sep 19, 2018
dee67a8
Bump FairRoot to allow C++17
Sep 19, 2018
5e0b6e1
Bump boost (v1.68), disable boost_python (C++17)
Sep 21, 2018
977273a
Bump ApMon to v2.2.8-alice2 (C++17)
Sep 24, 2018
64e8610
Bump Vc to fix the std::for_each_n issue
Sep 21, 2018
b3a6952
Bump yaml-cpp as well
Sep 24, 2018
1eb1100
No C++17 for GEANT4
Oct 3, 2018
dcac84d
Build boost with C++14 even under C++17
Oct 4, 2018
7333b6f
Add ROOT_INCLUDE_PATH to boost
Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apmon-cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: ApMon-CPP
version: "%(tag_basename)s"
tag: v2.2.8-alice1
tag: v2.2.8-alice2
source: https://github.com/alisw/apmon-cpp.git
build_requires:
- autotools
Expand Down
13 changes: 11 additions & 2 deletions boost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ build_requires:
prefer_system: (?!slc5)
prefer_system_check: |
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 105900)\n#error \"Cannot use system's boost. Boost > 1.59.00 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
prepend_path:
ROOT_INCLUDE_PATH: "$BOOST_ROOT/include"
---
#!/bin/bash -e

Expand All @@ -18,7 +20,13 @@ python -c 'import sys; sys.exit(1 if sys.version_info < (2, 7) else 0)'
pip --help &> /dev/null && \
printf '#include \"pyconfig.h"' | gcc -c $(python-config --includes) -xc -o /dev/null - || \
unset BOOST_PYTHON
[[ $BOOST_PYTHON ]] || WITHOUT_PYTHON="--without-python"
if [[ $CXXSTD && $CXXSTD -ge 17 ]]; then
# Compile boost with C++14 even if we are using C++17, and disable boost_python.
# See: https://github.com/boostorg/system/issues/26#issuecomment-413631998
CXXSTD=14
unset BOOST_PYTHON
fi
[[ $BOOST_PYTHON ]] || { WITHOUT_PYTHON="--without-python"; unset PYTHON_VERSION; }

TMPB2=$BUILDDIR/tmp-boost-build
case $ARCHITECTURE in
Expand Down Expand Up @@ -53,7 +61,7 @@ b2 -q \
link=shared \
threading=multi \
variant=release \
$EXTRA_CXXFLAGS \
${CXXSTD:+cxxstd=$CXXSTD} \
install
[[ $BOOST_PYTHON ]] && ls -1 "$INSTALLROOT"/lib/*boost_python* > /dev/null

Expand Down Expand Up @@ -83,5 +91,6 @@ module load BASE/1.0 ${GCC_TOOLCHAIN_VERSION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSI
# Our environment
setenv BOOST_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path LD_LIBRARY_PATH \$::env(BOOST_ROOT)/lib
prepend-path ROOT_INCLUDE_PATH \$::env(BOOST_ROOT)/include
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(BOOST_ROOT)/lib")
EoF
8 changes: 4 additions & 4 deletions defaults-alo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package: defaults-alo
version: v1
env:
CXXFLAGS: "-fPIC -O2 -std=c++14"
CXXFLAGS: "-fPIC -O2 -std=c++17"
CFLAGS: "-fPIC -O2"
CMAKE_BUILD_TYPE: "RELWITHDEBINFO"
CXXSTD: "14"
CXXSTD: "17"
CMAKE_GENERATOR: "Ninja"
disable:
- AliEn-Runtime
Expand All @@ -24,12 +24,12 @@ overrides:
autotools:
tag: v1.5.0
boost:
tag: "v1.66.0"
tag: "v1.68.0"
requires:
- "GCC-Toolchain:(?!osx)"
- Python-modules
prefer_system_check: |
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106600 || BOOST_VERSION > 106699)\n#error \"Cannot use system's boost: boost 1.66 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106800 || BOOST_VERSION > 106899)\n#error \"Cannot use system's boost: boost 1.68 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
GCC-Toolchain:
tag: v7.3.0-alice1
prefer_system_check: |
Expand Down
8 changes: 4 additions & 4 deletions defaults-o2-dataflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package: defaults-o2-dataflow
version: v1
env:
CXXFLAGS: "-fPIC -O2 -std=c++14"
CXXFLAGS: "-fPIC -O2 -std=c++17"
CFLAGS: "-fPIC -O2"
CMAKE_BUILD_TYPE: "RELWITHDEBINFO"
CXXSTD: "14"
CXXSTD: "17"
disable:
- AliEn-Runtime
- AliRoot
Expand All @@ -22,14 +22,14 @@ overrides:
autotools:
tag: v1.5.0
boost:
tag: "v1.66.0"
tag: "v1.68.0"
requires:
- "GCC-Toolchain:(?!osx)"
- Python-modules
- libpng
- lzma
prefer_system_check: |
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106600 || BOOST_VERSION > 106699)\n#error \"Cannot use system's boost: boost 1.66 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106800 || BOOST_VERSION > 106899)\n#error \"Cannot use system's boost: boost 1.68 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
GCC-Toolchain:
tag: v7.3.0-alice1
prefer_system_check: |
Expand Down
8 changes: 4 additions & 4 deletions defaults-o2-dev-fairroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package: defaults-o2-dev-fairroot
version: v1
env:
CXXFLAGS: "-fPIC -O2 -std=c++14"
CXXFLAGS: "-fPIC -O2 -std=c++17"
CFLAGS: "-fPIC -O2"
CMAKE_BUILD_TYPE: "RELWITHDEBINFO"
CXXSTD: "14"
CXXSTD: "17"
CMAKE_GENERATOR: "Ninja"
disable:
- AliEn-Runtime
Expand All @@ -13,14 +13,14 @@ overrides:
autotools:
tag: v1.5.0
boost:
tag: "v1.66.0"
tag: "v1.68.0"
requires:
- "GCC-Toolchain:(?!osx)"
- Python-modules
- libpng
- lzma
prefer_system_check: |
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106600 || BOOST_VERSION > 106699)\n#error \"Cannot use system's boost: boost 1.66 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106800 || BOOST_VERSION > 106899)\n#error \"Cannot use system's boost: boost 1.68 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
GCC-Toolchain:
tag: v7.3.0-alice1
prefer_system_check: |
Expand Down
8 changes: 4 additions & 4 deletions defaults-o2-ninja.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package: defaults-o2-ninja
version: v1
env:
CXXFLAGS: "-fPIC -O2 -std=c++14"
CXXFLAGS: "-fPIC -O2 -std=c++17"
CFLAGS: "-fPIC -O2"
CMAKE_BUILD_TYPE: "RELWITHDEBINFO"
CXXSTD: "14"
CXXSTD: "17"
CMAKE_GENERATOR: "Ninja"
disable:
- AliEn-Runtime
Expand All @@ -14,12 +14,12 @@ overrides:
autotools:
tag: v1.5.0
boost:
tag: "v1.66.0"
tag: "v1.68.0"
requires:
- "GCC-Toolchain:(?!osx)"
- Python-modules
prefer_system_check: |
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106600 || BOOST_VERSION > 106699)\n#error \"Cannot use system's boost: boost 1.66 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106800 || BOOST_VERSION > 106899)\n#error \"Cannot use system's boost: boost 1.68 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
GCC-Toolchain:
tag: v7.3.0-alice1
prefer_system_check: |
Expand Down
8 changes: 4 additions & 4 deletions defaults-o2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package: defaults-o2
version: v1
env:
CXXFLAGS: "-fPIC -O2 -std=c++14"
CXXFLAGS: "-fPIC -O2 -std=c++17"
CFLAGS: "-fPIC -O2"
CMAKE_BUILD_TYPE: "RELWITHDEBINFO"
CXXSTD: "14"
CXXSTD: "17"
disable:
- AliEn-Runtime
- grpc
Expand All @@ -13,12 +13,12 @@ overrides:
autotools:
tag: v1.5.0
boost:
tag: "v1.66.0"
tag: "v1.68.0"
requires:
- "GCC-Toolchain:(?!osx)"
- Python-modules
prefer_system_check: |
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106600 || BOOST_VERSION > 106699)\n#error \"Cannot use system's boost: boost 1.66 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106800 || BOOST_VERSION > 106899)\n#error \"Cannot use system's boost: boost 1.68 required.\"\n#endif\nint main(){}" | gcc -I$(brew --prefix boost)/include -xc++ - -o /dev/null
GCC-Toolchain:
tag: v7.3.0-alice1
prefer_system_check: |
Expand Down
2 changes: 1 addition & 1 deletion fairroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: FairRoot
version: "%(short_hash)s"
tag: "717dccd866ec07af10db1e021d189e9ff2ce0209"
tag: "acbd45f9d7626b39827953e8c2d6e373700e6c23"
source: https://github.com/FairRootGroup/FairRoot
requires:
- generators
Expand Down
2 changes: 2 additions & 0 deletions geant4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ env:
---
#!/bin/bash -e

[[ $CXXSTD > 14 ]] && CXXSTD=14 || true # Only C++14 is supported at the moment

cmake $SOURCEDIR \
-DGEANT4_INSTALL_DATA_TIMEOUT=2000 \
-DCMAKE_CXX_FLAGS="-fPIC" \
Expand Down
4 changes: 2 additions & 2 deletions vc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: Vc
version: "%(tag_basename)s"
tag: 1.3.3
source: https://github.com/VcDevel/Vc.git
tag: 1.3.3-alice2
source: https://github.com/alisw/Vc.git
requires:
- "GCC-Toolchain:(?!osx)"
build_requires:
Expand Down
4 changes: 2 additions & 2 deletions yaml-cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: yaml-cpp
version: "v0.5.2"
version: "%(tag_basename)s"
tag: yaml-cpp-0.6.2
source: https://github.com/jbeder/yaml-cpp
tag: release-0.5.2
requires:
- boost
build_requires:
Expand Down