From e97edfd764a3382c8ac53550ed54898d7cc27198 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Sep 2022 23:30:42 -0700 Subject: lmbench: Fix build time tests and use the scripts/build scripts/build does some configure like work before handing of compilation to make, and these tests are essential for OE builds too e.g. socklen_t differs between musl and glibc and this script can detect that well. Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb') diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 492ea4b10..d74c28f3f 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -9,7 +9,6 @@ inherit autotools-brokensep update-alternatives DEPENDS += "libtirpc" CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDLIBS += " -ltirpc " PR = "r2" @@ -23,7 +22,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://fix-lmbench-memory-check-failure.patch \ file://0001-avoid-gcc-optimize-away-the-loops.patch \ file://0001-lat_http.c-Add-printf-format.patch \ - file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ file://0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch \ file://0001-lmbench-Point-webpage-lm-to-target-directory.patch \ @@ -31,6 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://0001-lat_fifo-Fix-cleanup-sequence.patch \ file://0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch \ file://0001-bench.h-Fix-typo-in-specifying-string.h.patch \ + file://0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -38,8 +37,11 @@ SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lmbench/files/development/" UPSTREAM_CHECK_REGEX = "lmbench-(?P\d+(\.\d+)+-[a-z]+\d+)" +export OS = "${TARGET_SYS}" +export TARGET = "${TARGET_OS}" + EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}" LD="${LD}" OS="${TARGET_SYS}" \ + LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" BASE="${prefix}" MANDIR="${mandir}"' do_configure() { @@ -54,7 +56,7 @@ do_compile () { CFLAGS="${CFLAGS} -DHAVE_uint" fi install -d ${S}/bin/${TARGET_SYS} - oe_runmake -C src + ${S}/scripts/build } do_install () { -- cgit v1.2.3-54-g00ecf