diff options
Diffstat (limited to 'meta-oe/recipes-benchmark/lmbench')
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-bench.h-Fix-typo-in-specifying-string.h.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch | 239 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch) | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/obey-ranlib.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/update-config-script.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench/update-results-script.patch (renamed from meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 20 |
17 files changed, 292 insertions, 39 deletions
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch deleted file mode 100644 index d7169495fa..0000000000 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ac1657e11cbb0545bdf4d1124def8c013958ed7e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Jul 2017 18:08:51 -0700 -Subject: [PATCH] Check for musl define guard before redefining socklen_t - -musl uses __DEFINED_socklen_t so check for that as well -along with HAVE_socklen_t - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/bench.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bench.h b/src/bench.h -index 597d068..2ebdf5a 100644 ---- a/src/bench.h -+++ b/src/bench.h -@@ -77,7 +77,7 @@ typedef long long int64; - #endif /* HAVE_int64_t */ - #endif /* HAVE_int64 */ - --#ifndef HAVE_socklen_t -+#if !defined(HAVE_socklen_t) && !defined(__DEFINED_socklen_t) - typedef int socklen_t; - #endif - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch index b964bef1f0..ff926548b6 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch @@ -3,7 +3,7 @@ From: Roy Li <rongqing.li@windriver.com> Date: Thu, 5 May 2016 09:52:01 +0800 Subject: [PATCH] [PATCH] avoid gcc optimize-away the loops -Upstream-Status: pending +Upstream-Status: Pending Change expression used in do_integer_mul and do_uint64_mul benchmarks so GCC doesn't optimize-away the loops, other diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-bench.h-Fix-typo-in-specifying-string.h.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-bench.h-Fix-typo-in-specifying-string.h.patch new file mode 100644 index 0000000000..e9220ecbdd --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-bench.h-Fix-typo-in-specifying-string.h.patch @@ -0,0 +1,27 @@ +From 4bbedd25e74adb5cb181a9ae589adb2052ade630 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 23:34:48 -0700 +Subject: [PATCH] bench.h: Fix typo in specifying string.h + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/bench.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bench.h b/src/bench.h +index 2ebdf5a..750bebf 100644 +--- a/src/bench.h ++++ b/src/bench.h +@@ -21,7 +21,7 @@ typedef unsigned char bool_t; + #include <signal.h> + #include <errno.h> + #ifndef WIN32 +-#include <strings.h> ++#include <string.h> + #endif + #include <sys/types.h> + #ifndef WIN32 +-- +2.37.3 + diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch index d49dac5b20..9014f80ab6 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/2] doc: Fix typos in lat_unix_connect manual page Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> --- +Upstream-Status: Pending + doc/lat_unix_connect.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch index b27e6c9fe0..b960a7d19f 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch @@ -5,6 +5,8 @@ Subject: [PATCH] doc: Fix typos in manual pages Signed-off-by: He Zhe <zhe.he@windriver.com> --- +Upstream-Status: Pending + doc/bw_mem.8 | 2 +- doc/lat_fcntl.8 | 2 +- doc/lat_fifo.8 | 2 +- diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch index 42b14cecee..b46c5fae76 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch @@ -7,6 +7,8 @@ Files should be unlinked after all users exit. Signed-off-by: He Zhe <zhe.he@windriver.com> --- +Upstream-Status: Pending + src/lat_fifo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch index 943b3ec889..eaa4ad0814 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch @@ -6,6 +6,8 @@ Subject: [PATCH] lat_http.c: Add printf format Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/lat_http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch index 4a26b8ea7a..7b713a3243 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch @@ -8,6 +8,8 @@ Plus improve 'hello' copying in lmbench script. Signed-off-by: He Zhe <zhe.he@windriver.com> --- +Upstream-Status: Pending + scripts/lmbench | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch new file mode 100644 index 0000000000..f07cef6b38 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch @@ -0,0 +1,239 @@ +From bcc6816b92ecf409357865589069a82883d589f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Sep 2022 22:53:51 -0700 +Subject: [PATCH] scripts/build: Fix the tests to build with clang15 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + scripts/build | 50 +++++++++++++++++++++++++------------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +--- a/scripts/build ++++ b/scripts/build +@@ -21,7 +21,7 @@ trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BA + LDLIBS="$LDLIBS -lm" + + # check for HP-UX's ANSI compiler +-echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c ++echo "int main(int ac, char *av[]) { int i; }" > ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c 1>${NULL} 2>${NULL} + then + true; +@@ -39,7 +39,7 @@ arch=`echo $OS | awk -F- '{print $1;}'` + if [ "X$CC" = "Xcc" -a "X$arch" = "Xia64" ] + then + echo "#include <stdlib.h>" > ${BASE}$$.c +- echo "main(int ac, char *av[])" >> ${BASE}$$.c ++ echo "int main(int ac, char *av[])" >> ${BASE}$$.c + echo "{ long* p = (long*)malloc(sizeof(long));" >> ${BASE}$$.c + echo "*p = 0; exit((int)*p); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} +DD64 -o ${BASE}$$ ${BASE}$$.c 1>${NULL} 2>${NULL} \ +@@ -51,14 +51,14 @@ fi + + # check for bcopy (optionally set the SYS5 flag) + echo "#include <string.h>" > ${BASE}$$.c +-echo "main() { char a[256], b[256]; bcopy(a, b, 256); }" >> ${BASE}$$.c ++echo "int main() { char a[256], b[256]; bcopy(a, b, 256); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -DSYS5" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for valloc + echo "#include <stdlib.h>" > ${BASE}$$.c +-echo "main() { char* buf = valloc(123); }" >> ${BASE}$$.c ++echo "int main() { char* buf = valloc(123); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -Dvalloc=malloc" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -67,7 +67,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <unistd.h>" >> ${BASE}$$.c +-echo "main() { off64_t off; }" >> ${BASE}$$.c ++echo "int main() { off64_t off; }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_off64_t" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -76,7 +76,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <unistd.h>" >> ${BASE}$$.c +-echo "main() { int fd = 0; off64_t off = 0; off = lseek64(fd, off, SEEK_SET); }" >> ${BASE}$$.c ++echo "int main() { int fd = 0; off64_t off = 0; off = lseek64(fd, off, SEEK_SET); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_lseek64" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -88,7 +88,7 @@ echo "#include <sys/resource.h>" >> ${BA + echo "#ifndef RUSAGE_SELF" >> ${BASE}$$.c + echo "#define RUSAGE_SELF 0" >> ${BASE}$$.c + echo "#endif /* RUSAGE_SELF */" >> ${BASE}$$.c +-echo "main() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); }" >> ${BASE}$$.c ++echo "int main() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DRUSAGE" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -125,24 +125,24 @@ fi + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for -lrpc (cygwin/Windows) +-echo "extern int pmap_set(); main() { pmap_set(); }" >${BASE}$$.c ++echo "extern int pmap_set(void); int main() { pmap_set(); }" >${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + true; +-else +- ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} -lrpc 1>${NULL} 2>${NULL} \ +- && LDLIBS="${LDLIBS} -lrpc" ++elif ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} -lrpc 1>${NULL} 2>${NULL}; then ++ LDLIBS="${LDLIBS} -lrpc" ++else ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} -ltirpc 1>${NULL} 2>${NULL} && LDLIBS="${LDLIBS} -ltirpc" + fi + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for OSs that have S_IFFIFO instead of S_IFIFO + echo "#include <sys/stat.h>" > ${BASE}$$.c +-echo "main() { return (S_IFIFO); }" >> ${BASE}$$.c ++echo "int main() { return (S_IFIFO); }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + true; + else + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include <sys/stat.h>" > ${BASE}$$.c +- echo "main() { return (S_IFFIFO); }" >> ${BASE}$$.c ++ echo "int main() { return (S_IFFIFO); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -DS_IFIFO=S_IFFIFO" + fi +@@ -151,7 +151,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + # check that we have uint + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c +-echo "main() { uint i = 0; return (i); }" >> ${BASE}$$.c ++echo "int main() { uint i = 0; return (i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -161,7 +161,7 @@ HAVE_uint64=0 + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <rpc/types.h>" >> ${BASE}$$.c +-echo "main() { uint64 i = 0; return (int)(i); }" >> ${BASE}$$.c ++echo "int main() { uint64 i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint64=1" && HAVE_uint64=1; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -170,7 +170,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ${HAVE_uint64} = 0 ]; then + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c +- echo "main() { uint64_t i = 0; return (int)(i); }" >> ${BASE}$$.c ++ echo "int main() { uint64_t i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint64_t=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -181,7 +181,7 @@ HAVE_int64=0 + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <rpc/types.h>" >> ${BASE}$$.c +-echo "main() { int64 i = 0; return (int)(i); }" >> ${BASE}$$.c ++echo "int main() { int64 i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_int64=1" && HAVE_int64=1; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -190,7 +190,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ${HAVE_int64} = 0 ]; then + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c +- echo "main() { int64_t i = 0; return (int)(i); }" >> ${BASE}$$.c ++ echo "int main() { int64_t i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_int64_t=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -209,7 +209,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <sys/socket.h>" >> ${BASE}$$.c +-echo "main() { int s; struct sockaddr dest; socklen_t len; getsockname(s, &dest, &len); }" >> ${BASE}$$.c ++echo "int main() { int s; struct sockaddr dest; socklen_t len; getsockname(s, &dest, &len); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_socklen_t" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -217,7 +217,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + # check that we have drand48 and srand48 + HAVE_RANDOM=0 + echo "#include <stdlib.h>" > ${BASE}$$.c +-echo "main() { srand48(973); return (int)(1.0E9 * drand48()); }" >> ${BASE}$$.c ++echo "int main() { srand48(973); return (int)(1.0E9 * drand48()); }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_DRAND48" + HAVE_RANDOM=1 +@@ -226,7 +226,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + if [ ${HAVE_RANDOM} -eq 0 ]; then + echo "#include <stdlib.h>" > ${BASE}$$.c +- echo "main() { srand(973); return (10 * rand()) / RAND_MAX; }" >> ${BASE}$$.c ++ echo "int main() { srand(973); return (10 * rand()) / RAND_MAX; }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_RAND" + HAVE_RANDOM=1 +@@ -236,7 +236,7 @@ fi + + if [ ${HAVE_RANDOM} -eq 0 ]; then + echo "#include <stdlib.h>" > ${BASE}$$.c +- echo "main() { srandom(973); return (10 * random()) / RAND_MAX; }" >> ${BASE}$$.c ++ echo "int main() { srandom(973); return (10 * random()) / RAND_MAX; }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_RANDOM" + HAVE_RANDOM=1 +@@ -247,7 +247,7 @@ fi + # check that we have sysmp + echo "#include <sys/types.h>" > ${BASE}$$.c + echo "#include <sys/sysmp.h>" >> ${BASE}$$.c +-echo "main() { return (int)sysmp(MP_NPROCS); }" >> ${BASE}$$.c ++echo "int main() { return (int)sysmp(MP_NPROCS); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_SYSMP=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -257,7 +257,7 @@ echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <unistd.h>" >> ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <sys/processor.h>" >> ${BASE}$$.c +-echo "main() { return bindprocessor(BINDPROCESS, getpid(), 0); }" >> ${BASE}$$.c ++echo "int main() { return bindprocessor(BINDPROCESS, getpid(), 0); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_BINDPROCESSOR=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -267,16 +267,17 @@ echo "#include <stdlib.h>" > ${BASE}$$.c + echo "#include <sys/types.h>" >> ${BASE}$$.c + echo "#include <sys/processor.h>" >> ${BASE}$$.c + echo "#include <sys/procset.h>" >> ${BASE}$$.c +-echo "main() { return processor(P_PID, P_MYPID, 0, NULL); }" >> ${BASE}$$.c ++echo "int main() { return processor(P_PID, P_MYPID, 0, NULL); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_BINDPROCESSOR=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check that we have sched_setaffinity +-echo "#include <stdlib.h>" > ${BASE}$$.c ++echo "#define _GNU_SOURCE" > ${BASE}$$.c ++echo "#include <stdlib.h>" >> ${BASE}$$.c + echo "#include <unistd.h>" >> ${BASE}$$.c + echo "#include <sched.h>" >> ${BASE}$$.c +-echo "main() { unsigned long mask = 1; return sched_setaffinity(0, sizeof(unsigned long), &mask); }" >> ${BASE}$$.c ++echo "int main() { unsigned long mask = 1; return sched_setaffinity(0, sizeof(unsigned long), &mask); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_SCHED_SETAFFINITY=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -285,4 +286,4 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR}; fi + + # now go ahead and build everything! +-${MAKE} OS="${OS}" CC="${CC}" CFLAGS="${CFLAGS}" LDLIBS="${LDLIBS}" O="${BINDIR}" $* ++${MAKE} OS="${OS}" CC="${CC}" CFLAGS="${CFLAGS}" LDLIBS="${LDLIBS}" O="${BINDIR}" ${EXTRA_OEMAKE} $* +--- a/src/lib_sched.c ++++ b/src/lib_sched.c +@@ -1,3 +1,4 @@ ++#define _GNU_SOURCE + #include "bench.h" + + /* #define _DEBUG */ diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch index 04cef960fc..04cef960fc 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch index 1d5d9c12ab..096726cc23 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch @@ -9,6 +9,8 @@ to link in librirpc, make room for those changes to take effect Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + scripts/build | 2 +- src/Makefile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch index cbab5c424e..0274bc32af 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch @@ -24,7 +24,7 @@ Signed-off-by: Fupan Li <fupan.li@windriver.com> Add and reword above comments -Upstream-status: inappropriate [ configuration ] +Upstream-Status: Inappropriate [ configuration ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch index 30708c81db..ae2443476a 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch @@ -13,7 +13,7 @@ Signed-off-by: Fupan Li <fupan.li@windriver.com> Reworded patch description. -Upstream-status: inappropriate [ configuration ] +Upstream-Status: Inappropriate [ configuration ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/obey-ranlib.patch index fa5e6dbda3..fa5e6dbda3 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/obey-ranlib.patch diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/update-config-script.patch index 44bc7bbcde..44bc7bbcde 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/update-config-script.patch diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/update-results-script.patch index 31c4aecbbe..31c4aecbbe 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/update-results-script.patch 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 7d141d8c7e..6729e81fa5 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -1,7 +1,7 @@ SUMMARY = "Tools for performance analysis" HOMEPAGE = "http://lmbench.sourceforge.net/" SECTION = "console/utils" -LICENSE = "GPLv2 & GPL-2.0-with-lmbench-restriction" +LICENSE = "GPL-2.0-only & GPL-2.0-with-lmbench-restriction" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://COPYING-2;md5=8e9aee2ccc75d61d107e43794a25cdf9" @@ -9,9 +9,7 @@ inherit autotools-brokensep update-alternatives DEPENDS += "libtirpc" CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDLIBS += " -ltirpc " -PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://lmbench-run \ @@ -23,13 +21,14 @@ 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 \ file://0001-doc-Fix-typos-in-manual-pages.patch \ 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" @@ -37,8 +36,11 @@ SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lmbench/files/development/" UPSTREAM_CHECK_REGEX = "lmbench-(?P<pver>\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() { @@ -53,7 +55,7 @@ do_compile () { CFLAGS="${CFLAGS} -DHAVE_uint" fi install -d ${S}/bin/${TARGET_SYS} - oe_runmake -C src + ${S}/scripts/build } do_install () { @@ -73,7 +75,7 @@ do_install () { DESTDIR="${D}" \ -C src install mv ${D}${bindir}/line ${D}${bindir}/lm_line - install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ + install -m 0755 ${UNPACKDIR}/lmbench-run ${D}${bindir}/ install -m 0755 ${S}/bin/${TARGET_SYS}/cache ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ @@ -96,6 +98,6 @@ pkg_postinst:${PN} () { RDEPENDS:${PN} = "perl" FILES:${PN} += "${datadir}/lmbench" -ALTERNATIVE:${PN} = "stream" +ALTERNATIVE:${PN} = "stream hello" ALTERNATIVE_LINK_NAME[stream] = "${bindir}/stream" - +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" |