diff --git a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch index 32a88b2..0c89152 100644 --- a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch +++ b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch @@ -1,7 +1,7 @@ -From 53f8a8dffa571de99b50f1a7b757cfd7d8c24d21 Mon Sep 17 00:00:00 2001 +From 9c9dce2e5f04de65b7b00321f96fff6071546ea1 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 17 Oct 2022 15:44:16 +0800 -Subject: [PATCH 1/4] configure: skip toolchain checks +Subject: [PATCH] configure: skip toolchain checks Current logic fetch full command line along with the tool. i.e gcc -m64 -march=skylake -mtune=generic ... @@ -14,17 +14,18 @@ environment too. Upstream-Status: Inappropriate Signed-off-by: Naveen Saini + --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index 70fdfdf..48d1ea5 100755 +index b4e824f..10618fc 100755 --- a/configure +++ b/configure -@@ -38,12 +38,12 @@ check_toolchain() - : ${EMACS=emacs} - : ${ARCH_INCLUDES=} +@@ -69,12 +69,12 @@ check_toolchain() + CLANG=$(find_tool clang "$CLANG") + LLC=$(find_tool llc "$LLC") - for TOOL in $PKG_CONFIG $CC $LD $OBJCOPY $CLANG $LLC $M4; do - if [ ! $(command -v ${TOOL} 2>/dev/null) ]; then @@ -40,7 +41,4 @@ index 70fdfdf..48d1ea5 100755 + #done clang_version=$($CLANG --version | grep -Po '(?<=clang version )[[:digit:]]+') - echo "Found clang binary '$CLANG' with version $clang_version (from '$($CLANG --version | head -n 1)')" --- -2.25.1 - + if [ "$?" -ne "0" ]; then diff --git a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb similarity index 95% rename from dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb rename to dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb index 7cd49a0..bd3182d 100644 --- a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb +++ b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/xdp-project/xdp-tools.git;branch=v1.2;protocol=https file://0004-Makefile-fix-libxdp.pc-error.patch \ " -SRCREV = "d4ff1f9bcf8b03556b625ab6e16958598482e861" +SRCREV = "57a139f9bf6ef644f9c1deb4f7df4bb4c76d6179" S = "${WORKDIR}/git"