Create toolchain meta components

.orchestra/ci/ci-run.sh

@@ -111,6 +111,7 @@ if test -n "$REVNG_ORCHESTRA_URL"; then
             break
         fi
     done
+    log "Installed orchestra from $REVNG_ORCHESTRA_URL@$REVNG_ORCHESTRA_TARGET_BRANCH"
 else
     pip3 -q install --user revng-orchestra
 fi

.orchestra/config/components/boost.yml

@@ -26,10 +26,10 @@ install: |
     install
 
 build_dependencies:
-  - host-cxx-toolchain
+  - toolchain/host/cxx-toolchain
   - glibc
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
   - libunwind
 #@ end
 

.orchestra/config/components/caliban.yml

@@ -9,9 +9,9 @@ extra_cmake_args: #@ cmake_boost_configuration
 build_dependencies:
   - cmake
   - glibc
-  - host-cxx-toolchain
+  - toolchain/host/cxx-toolchain
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
   - llvm
   - revng
   - revng-c

.orchestra/config/components/clang_release.yml

@@ -48,7 +48,7 @@ install: |
 build_dependencies:
   - cmake
 dependencies:
-  - gcc-host-toolchain
+  - toolchain/host/gcc-toolchain
   - libunwind
 #@ end
 

.orchestra/config/components/cmake.yml

@@ -22,7 +22,7 @@ configure: |
     -DCMAKE_USE_OPENSSL=OFF
 build_system: make
 build_dependencies:
-  - gcc-host-toolchain
+  - toolchain/host/gcc-toolchain
 #@ end
 
 #@overlay/match by=overlay.all, expects=1

.orchestra/config/components/elfutils.yml

@@ -25,7 +25,7 @@ configure: |
     CFLAGS="-Wno-error"
 build_system: make
 build_dependencies:
-  - host-c-toolchain
+  - toolchain/host/cxx-toolchain
   - glibc
 dependencies:
   - zlib

.orchestra/config/components/glib.yml

@@ -43,7 +43,7 @@ install: |
   (@= ninja @)
   (@= ninja @) install
 build_dependencies:
-  - host-c-toolchain
+  - toolchain/host/cxx-toolchain
   - glibc
 dependencies:
   - libffi

.orchestra/config/components/libedit.yml

@@ -19,7 +19,7 @@ configure: |
     --prefix="$ORCHESTRA_ROOT"
 build_system: make
 build_dependencies:
-  - gcc-host-toolchain
+  - toolchain/host/gcc-toolchain
   - glibc
 dependencies:
   - ncurses

.orchestra/config/components/libffi.yml

@@ -21,7 +21,7 @@ configure: |
     --prefix="$ORCHESTRA_ROOT"
 build_system: make
 build_dependencies:
-  - host-c-toolchain
+  - toolchain/host/gcc-toolchain
   - glibc
 #@ end
 

.orchestra/config/components/libfort.yml

@@ -5,11 +5,11 @@
 #@ def build_args():
 source_url: "https://github.com/seleznevae/libfort/archive/v0.4.2.tar.gz"
 build_dependencies:
-  - gcc-host-toolchain
+  - toolchain/host/gcc-toolchain
   - cmake
   - glibc
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
 use_asan: false
 #@ end
 

.orchestra/config/components/libltdl.yml

@@ -19,7 +19,7 @@ configure: |
     CFLAGS="-Wno-error"
 build_system: make
 build_dependencies:
-  - host-c-toolchain
+  - toolchain/host/cxx-toolchain
   - glibc
 #@ end
 

.orchestra/config/components/libunwind.yml

@@ -27,7 +27,7 @@ configure: |
     --prefix="$ORCHESTRA_ROOT"
 build_system: make
 build_dependencies:
-  - gcc-host-toolchain
+  - toolchain/host/gcc-toolchain
   - glibc
 #@ end
 

.orchestra/config/components/llvm.yml

@@ -44,9 +44,9 @@ builds:
 
       build_dependencies:
         - cmake
-        - host-cxx-toolchain
+        - toolchain/host/cxx-toolchain
       dependencies:
-        - host-libcxx
+        - toolchain/host/cxx-runtime
         - libunwind
       #@ if/end ndebug == False:
       ndebug: false

.orchestra/config/components/ncurses.yml

@@ -48,7 +48,7 @@ configure: |
     --prefix="$ORCHESTRA_ROOT"
 build_system: make
 build_dependencies:
-  - gcc-host-toolchain
+  - toolchain/host/gcc-toolchain
   - glibc
 #@ end
 

.orchestra/config/components/qemu.yml

@@ -41,7 +41,7 @@ builds:
         cd "$BUILD_DIR"
         (@= make @) install
       build_dependencies:
-        - host-c-toolchain
+        - toolchain/host/cxx-toolchain
         - clang-release
         - glibc
         - llvm

.orchestra/config/components/revng.yml

@@ -9,9 +9,9 @@ build_dependencies:
   - cmake
   - revng-qa
   - glibc
-  - host-cxx-toolchain
+  - toolchain/host/cxx-toolchain
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
   - llvm
   - qemu
   - boost

.orchestra/config/components/revng_c.yml

@@ -8,9 +8,9 @@ extra_cmake_args: #@ cmake_boost_configuration
 build_dependencies:
   - cmake
   - glibc
-  - host-cxx-toolchain
+  - toolchain/host/cxx-toolchain
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
   - revng
   - boost
   - revng-qa

.orchestra/config/components/revng_qa.yml

@@ -22,16 +22,16 @@ configure: |
 build_system: make
 build_dependencies:
   - cmake
-  - host-cxx-toolchain
   - glibc
   - qemu
-  - toolchain/x86-64/gcc
-  - toolchain/i386/gcc
-  - toolchain/arm/gcc
-  - toolchain/aarch64/gcc
-  - toolchain/s390x/gcc
-  - toolchain/mips/gcc
-  - toolchain/mipsel/gcc
+  - toolchain/host/cxx-toolchain
+  - toolchain/x86-64/cxx-toolchain
+  - toolchain/i386/cxx-toolchain
+  - toolchain/arm/cxx-toolchain
+  - toolchain/aarch64/cxx-toolchain
+  - toolchain/s390x/cxx-toolchain
+  - toolchain/mips/cxx-toolchain
+  - toolchain/mipsel/cxx-toolchain
 #@ end
 
 #@overlay/match by=overlay.all, expects=1

.orchestra/config/components/toolchain/arch/host.yml

@@ -44,6 +44,7 @@ extra_gcc_configure_options:
 extra_binutils_configure_options:
   - --enable-gold=default
 extra_gcc_make_variables: LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
+create_cxx_toolchain_meta_component: false
 #@ end
 
 #@overlay/match by=overlay.all, expects=1
@@ -52,11 +53,39 @@ extra_gcc_make_variables: LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
 components:
   _: #@ template.replace(create_toolchain_components(**params()))
 
-  gcc-host-toolchain:
+  toolchain/host/gcc-toolchain:
     builds:
       default:
         dependencies:
           - toolchain/host/gcc
           - toolchain/host/binutils
-        install: exit 0
-        configure: mkdir -p "$BUILD_DIR"
+        configure: |
+          echo "Dummy configure script for toolchain/host/gcc-toolchain"
+          mkdir -p "$BUILD_DIR"
+        install: |
+          echo "Dummy install script for toolchain/host/gcc-toolchain"
+
+  toolchain/host/cxx-toolchain:
+    builds:
+      default:
+        dependencies:
+          - glibc
+          - toolchain/host/binutils
+          - clang-release
+        configure: |
+          echo "Dummy configure script for toolchain/host/cxx-toolchain"
+          mkdir -p "$BUILD_DIR"
+        install: |
+          echo "Dummy install script for toolchain/host/cxx-toolchain"
+
+  toolchain/host/cxx-runtime:
+    builds:
+      default:
+        dependencies:
+          - clang-release
+          - toolchain/host/gcc
+        configure: |
+          echo "Dummy configure script for toolchain/host/cxx-runtime"
+          mkdir -p "$BUILD_DIR"
+        install: |
+          echo "Dummy install script for toolchain/host/cxx-runtime"

.orchestra/config/components/toolchain/lib/toolchain.lib.yml

@@ -34,31 +34,44 @@
 #@    extra_gcc_make_variables="",
 #@    dynamic=None,
 #@    spec=False,
+#@    create_cxx_toolchain_meta_component=True,
 #@ ):
 
+#@ if/end create_cxx_toolchain_meta_component:
+toolchain/(@= toolchain_name @)/cxx-toolchain:
+  builds:
+    default:
+      configure: |
+        echo "Dummy configure script for toolchain/(@= toolchain_name @)/cxx-toolchain"
+        mkdir -p "$BUILD_DIR"
+      install: |
+        echo "Dummy install script for toolchain/(@= toolchain_name @)/cxx-toolchain"
+      dependencies:
+        - toolchain/(@= toolchain_name @)/gcc@stage2
+
 #@ if/end binutils_version:
-(@= "toolchain/" + toolchain_name + "/binutils" @): #@ create_binutils_component(toolchain_name=toolchain_name, triple=triple, binutils_version=binutils_version, extra_binutils_configure_options=extra_binutils_configure_options, binutils_sysroot=binutils_sysroot)
+toolchain/(@= toolchain_name @)/binutils: #@ create_binutils_component(toolchain_name=toolchain_name, triple=triple, binutils_version=binutils_version, extra_binutils_configure_options=extra_binutils_configure_options, binutils_sysroot=binutils_sysroot)
 
 #@ if/end gdb_version:
-(@= "toolchain/" + toolchain_name + "/gdb" @): #@ create_gdb_component(triple=triple, gdb_version=gdb_version)
+toolchain/(@= toolchain_name @)/gdb: #@ create_gdb_component(triple=triple, gdb_version=gdb_version)
 
 #@ if/end linux_version:
-(@= "toolchain/" + toolchain_name + "/linux-headers" @): #@ create_linux_headers_component(triple=triple, linux_version=linux_version, arch_name=linux_arch_name)
+toolchain/(@= toolchain_name @)/linux-headers: #@ create_linux_headers_component(triple=triple, linux_version=linux_version, arch_name=linux_arch_name)
 
 #@ if/end gcc_version:
-(@= "toolchain/" + toolchain_name + "/gcc" @): #@ create_gcc_component(toolchain_name=toolchain_name, triple=triple, gcc_sysroot=gcc_sysroot, gcc_version=gcc_version, extra_gcc_configure_options=extra_gcc_configure_options, extra_gcc_make_variables=extra_gcc_make_variables, musl_version=musl_version, uclibc_version=uclibc_version, linux_version=linux_version, mingw64_version=mingw64_version)
+toolchain/(@= toolchain_name @)/gcc: #@ create_gcc_component(toolchain_name=toolchain_name, triple=triple, gcc_sysroot=gcc_sysroot, gcc_version=gcc_version, extra_gcc_configure_options=extra_gcc_configure_options, extra_gcc_make_variables=extra_gcc_make_variables, musl_version=musl_version, uclibc_version=uclibc_version, linux_version=linux_version, mingw64_version=mingw64_version)
 
 #@ if/end mingw64_version:
-(@= "toolchain/" + toolchain_name + "/mingw64" @): #@ create_mingw64_component(toolchain_name=toolchain_name, triple=triple, mingw64_version=mingw64_version, gcc_version=gcc_version)
+toolchain/(@= toolchain_name @)/mingw64: #@ create_mingw64_component(toolchain_name=toolchain_name, triple=triple, mingw64_version=mingw64_version, gcc_version=gcc_version)
 
 #@ if/end musl_version:
-(@= "toolchain/" + toolchain_name + "/musl" @): #@ create_musl_component(triple=triple, musl_version=musl_version, toolchain_name=toolchain_name, gcc_version=gcc_version)
+toolchain/(@= toolchain_name @)/musl: #@ create_musl_component(triple=triple, musl_version=musl_version, toolchain_name=toolchain_name, gcc_version=gcc_version)
 
 #@ if/end coreutils_version:
-(@= "toolchain/" + toolchain_name + "/coreutils" @): #@ create_coreutils_component(triple=triple, coreutils_version=coreutils_version)
+toolchain/(@= toolchain_name @)/coreutils: #@ create_coreutils_component(triple=triple, coreutils_version=coreutils_version)
 
 #@ if/end uclibc_version:
-(@= "toolchain/" + toolchain_name + "/uclibc" @): #@ create_uclibc_component(triple=triple, toolchain_name=toolchain_name, uclibc_version=uclibc_version, uclibc_arch_name=uclibc_arch_name, gcc_version=gcc_version, binutils_version=binutils_version)
+toolchain/(@= toolchain_name @)/uclibc: #@ create_uclibc_component(triple=triple, toolchain_name=toolchain_name, uclibc_version=uclibc_version, uclibc_arch_name=uclibc_arch_name, gcc_version=gcc_version, binutils_version=binutils_version)
 
 #@ if/end spec:
 _: #@ template.replace(create_spec_components(triple=triple, toolchain_name=toolchain_name))

.orchestra/config/components/toolchain/macos/ld64.yml

@@ -46,9 +46,9 @@ toolchain/macos/(@= name @)/ld64:
         (@= make @)
         (@= make @) install
       build_dependencies:
-        - host-cxx-toolchain
+        - toolchain/host/cxx-toolchain
       dependencies:
-        - host-libcxx
+        - toolchain/host/cxx-runtime
         - toolchain/macos/libtapi
 #@ end
 #@ end

.orchestra/config/components/toolchain/macos/libtapi.yml

@@ -37,9 +37,9 @@ builds:
       cp -a projects/libtapi/include/tapi/Version.inc "${TMP_ROOT}${ORCHESTRA_ROOT}/include/tapi/"
     build_dependencies:
       - cmake
-      - host-cxx-toolchain
+      - toolchain/host/cxx-toolchain
     dependencies:
-      - host-libcxx
+      - toolchain/host/cxx-runtime
 #@ end
 
 #@overlay/match by=overlay.all, expects=1

.orchestra/config/components/ui/adaptagrams.yml

@@ -6,9 +6,9 @@
 build_dependencies:
   - cmake
   - glibc
-  - host-cxx-toolchain
+  - toolchain/host/cxx-toolchain
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
 use_asan: false
 #@ end
 

.orchestra/config/components/ui/cold_revng.yml

@@ -18,9 +18,9 @@ extra_cmake_args:
 build_dependencies:
   - cmake
   - glibc
-  - host-cxx-toolchain
+  - toolchain/host/cxx-toolchain
 dependencies:
-  - host-libcxx
+  - toolchain/host/cxx-runtime
   - caliban
   - ui/graphviz
   - ui/adaptagrams

.orchestra/config/components/ui/freetype.yml

@@ -25,7 +25,7 @@ configure: |
     --prefix="$ORCHESTRA_ROOT"
 build_system: make
 build_dependencies:
-  - host-c-toolchain
+  - toolchain/host/cxx-toolchain
   - glibc
 #@ end