Merge pull request #466 from meta-rust/fix-proc-macro

Fix "could not compile proc-macro2"

Author: srwalter

.github/workflows/main.yml

@@ -28,11 +28,12 @@ jobs:
           . oe-init-build-env
           mv ../../sstate-cache . || true
           bitbake-layers add-layer ../../meta-openembedded/meta-oe
-          bitbake-layers add-layer ../../meta-rust
+          sed -ie "/^BBLAYERS/a $(readlink -f ../../meta-rust) \\\\" conf/bblayers.conf
           echo 'PARALLEL_MAKE:pn-rust-llvm-native = "-j2"' >> conf/local.conf
           echo 'TOOLCHAIN_HOST_TASK:append = " packagegroup-rust-cross-canadian-${MACHINE}"' >> conf/local.conf
           echo 'PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"' >> conf/local.conf
           echo 'INHERIT:remove = "uninative"' >> conf/local.conf
+          echo 'require conf/distro/include/rust_versions.inc' >> conf/local.conf
       - name: Run bitbake
         run: |
           cd poky

classes-recipe

@@ -0,0 +1 @@
+classes/

classes/crate-fetch.bbclass

@@ -8,6 +8,9 @@
 #
 
 python () {
+        import sys
+        layerdir = d.getVar("RUSTLAYER")
+        sys.path.insert(0, layerdir + "/lib")
         import crate
         bb.fetch2.methods.append( crate.Crate() )
 }

conf/layer.conf

@@ -1,4 +1,5 @@
 # We have a conf and classes directory, append to BBPATH
+RUSTLAYER = "${LAYERDIR}"
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES

recipes-devtools/rust/libstd-rs_%.bbappend

@@ -0,0 +1 @@
+S = "${RUSTSRC}/library/sysroot"