Skip to content
Snippets Groups Projects
Commit 54370ee8 authored by Filippo Cremonese's avatar Filippo Cremonese
Browse files

Switch boost to the overlay convention

parent d2676434
No related branches found
No related tags found
No related merge requests found
......@@ -15,7 +15,6 @@
#@ load("/components/glibc.lib.yml", "glibc_component")
#@ load("/components/libffi.lib.yml", "libffi_component")
#@ load("/components/qemu.lib.yml", "qemu_component")
#@ load("/components/boost.lib.yml", "boost_component")
#@ load("/components/revng.lib.yml", "revng_component")
#@ load("/components/revng_c.lib.yml", "revng_c_component")
#@ load("/components/caliban.lib.yml", "caliban_component")
......@@ -71,7 +70,6 @@ components:
glibc: #@ glibc_component
libffi: #@ libffi_component
qemu: #@ qemu_component
boost: #@ boost_component
revng: #@ revng_component
revng-c: #@ revng_c_component
caliban: #@ caliban_component
......
#@ load("/global_options.lib.yml", "options")
#@yaml/text-templated-strings
---
#@ def _boost_component():
builds:
default:
configure: |
mkdir -p "$BUILD_DIR"
extract.sh --into "$BUILD_DIR" "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
patch-if-exists "${PATCH_DIR}/boost-1.63.0-icl-disable-LessThanComparableConcept.patch" "$BUILD_DIR"
cd "$BUILD_DIR" && ./bootstrap.sh --prefix="$ORCHESTRA_ROOT" --with-libraries=test
install: |
cd "$BUILD_DIR"
export ORIGIN='$ORIGIN'
./b2 \
--prefix="${DESTDIR}${ORCHESTRA_ROOT}" \
--ignore-site-config toolset='clang' \
cxxflags='(@= options["use_old_glibc_cflags"] @) (@= options["regular_cxx_flags"] @)' \
linkflags='(@= options["use_old_glibc_lflags"] @) (@= options["regular_linker_flags"] @) -Wl,-rpath=$ORIGIN/../lib'
./b2 \
--prefix="${DESTDIR}${ORCHESTRA_ROOT}" \
--ignore-site-config toolset='clang' \
cxxflags='(@= options["regular_cxx_flags"] @)' \
linkflags='(@= options["regular_linker_flags"] @) -Wl,-rpath=$ORIGIN/../lib' \
install
dependencies:
- clang-release
- toolchain/host/gcc
- libunwind
#@ end
---
#@ boost_component = _boost_component()
#@ load("@ytt:template", "template")
#@ load("@ytt:overlay", "overlay")
#@ load("/lib/create_component.lib.yml", "single_build_component")
#@ load("/global_options.lib.yml", "options")
#@ def _boost():
configure: |
mkdir -p "$BUILD_DIR"
extract.sh --into "$BUILD_DIR" "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
patch-if-exists "${PATCH_DIR}/boost-1.63.0-icl-disable-LessThanComparableConcept.patch" "$BUILD_DIR"
cd "$BUILD_DIR" && ./bootstrap.sh --prefix="$ORCHESTRA_ROOT" --with-libraries=test
install: |
cd "$BUILD_DIR"
export ORIGIN='$ORIGIN'
./b2 \
--prefix="${DESTDIR}${ORCHESTRA_ROOT}" \
--ignore-site-config toolset='clang' \
cxxflags='(@= options["use_old_glibc_cflags"] @) (@= options["regular_cxx_flags"] @)' \
linkflags='(@= options["use_old_glibc_lflags"] @) (@= options["regular_linker_flags"] @) -Wl,-rpath=$ORIGIN/../lib'
./b2 \
--prefix="${DESTDIR}${ORCHESTRA_ROOT}" \
--ignore-site-config toolset='clang' \
cxxflags='(@= options["regular_cxx_flags"] @)' \
linkflags='(@= options["regular_linker_flags"] @) -Wl,-rpath=$ORIGIN/../lib' \
install
dependencies:
- clang-release
- toolchain/host/gcc
- libunwind
#@ end
#@overlay/match by=overlay.all, expects=1
#@overlay/match-child-defaults missing_ok=True
#@yaml/text-templated-strings
---
components:
boost: #@ single_build_component(**_boost())
......@@ -15,8 +15,9 @@
#@ build_dependencies=[],
#@ repository=None,
#@ add_to_path=[],
#@ pre_install="",
#@ post_install="",
#@ install=None,
#@ pre_install=None,
#@ post_install=None,
#@ ):
#@ if/end repository:
......@@ -33,17 +34,24 @@ builds:
configure: #@ configure
install: |
(@-= pre_install -@)
cd "$BUILD_DIR"
(@- if pre_install: @)
(@-= pre_install @)
(@ end -@)
(@- if build_system == "make": @)
cd "$BUILD_DIR"
(@= make @)
(@= make @) install
(@- elif build_system == "ninja": @)
cd "$BUILD_DIR"
ninja install
(@ else: @)
(@ fail("build_system must be either make or ninja") @)
(@- end @)
(@- elif install: @)
(@-= install -@)
(@- else: @)
(@- fail("build_system must be either make or ninja or you must specify an install script") @)
(@- end -@)
(@- if post_install: -@)
(@= post_install -@)
(@- end -@)
#@ if/end add_to_path:
add_to_path: #@ add_to_path
#@ end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment