diff --git a/local/recipes/dev/bison/recipe.toml b/local/recipes/dev/bison/recipe.toml index 127b5decf5..4c32e094de 100644 --- a/local/recipes/dev/bison/recipe.toml +++ b/local/recipes/dev/bison/recipe.toml @@ -102,7 +102,9 @@ sed -i 's|^BISON = .*|BISON = /usr/bin/bison|' "${COOKBOOK_BUILD}/Makefile" ${CC} -c -I"${COOKBOOK_BUILD}/lib" -I"${COOKBOOK_SYSROOT}/include" \ "${COOKBOOK_ROOT}/local/scripts/gnulib-stubs/fseterr-redox.c" \ -o "${COOKBOOK_BUILD}/lib/fseterr-redox.o" -ar rcs "${COOKBOOK_BUILD}/lib/libbison.a" "${COOKBOOK_BUILD}/lib/fseterr-redox.o" +# Inject stub object into the link command via LIBS, avoiding static +# archive member ordering issues. +sed -i 's|^LIBS = |LIBS = lib/fseterr-redox.o |' "${COOKBOOK_BUILD}/Makefile" "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" "${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}" """ diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml index 6671a26478..edae61bd54 100644 --- a/recipes/core/base-initfs/recipe.toml +++ b/recipes/core/base-initfs/recipe.toml @@ -82,6 +82,7 @@ cp -v "${COOKBOOK_SOURCE}/drivers/initfs-pcid-storage.toml" "${COOKBOOK_BUILD}/i export CARGO_PROFILE_RELEASE_OPT_LEVEL=s export CARGO_PROFILE_RELEASE_PANIC=abort rm -rf "${CARGO_TARGET_DIR}" +export BUILD_TIMESTAMP="$(date +%s)" "${COOKBOOK_CARGO}" build ${build_flags} \ --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)