From ff70976c10bae16231319274611f1a07744a0a48 Mon Sep 17 00:00:00 2001 From: Pierre Blanc Date: Thu, 24 Aug 2023 14:42:39 +0200 Subject: Fix armhf support patch to look for "arm" instead of "armv7l", Last-Update: 2012-12-02 since configure is looking at the triplet, not uname output. Gbp-Pq: Name armhf_support --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aba8791..0dc08fc 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ case x"$target_cpu" in AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], [Defined if the target CPU is PowerPC]) ;; - "xarmv7a") + "xarm") AC_DEFINE([STRESSAPPTEST_CPU_ARMV7A],[], [Defined if the target CPU is armv7a]) ;; -- cgit v1.2.3 From 772d57f4cbd189558da735eae79f65fe31efecc4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 12 Jun 2012 01:01:39 +0200 Subject: Support building on i486 Gbp-Pq: Name support_i486_builds --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 0dc08fc..8529dff 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ case x"$target_cpu" in AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) ;; + "xi486"*) + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i486]) + ;; "xpowerpc") AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], [Defined if the target CPU is PowerPC]) -- cgit v1.2.3 From 545e15c4c6c3f5a0d96bc78cb19b57daf99cc7a5 Mon Sep 17 00:00:00 2001 From: Pierre Blanc Date: Thu, 24 Aug 2023 14:42:39 +0200 Subject: support_i586_builds Gbp-Pq: Name support_i586_builds --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 8529dff..603ba73 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ case x"$target_cpu" in AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) ;; + "xi586"*) + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i586]) + ;; "xi486"*) AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i486]) -- cgit v1.2.3 From 7c480b3eb127c4974507ec566aa72a244321ac52 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 24 Aug 2023 14:42:39 +0200 Subject: Backport upstream fix for FTBFS with gcc 12 Bug-Debian: https://bugs.debian.org/1013043 Forwarded: https://github.com/stressapptest/stressapptest/commit/2ea87b7996f4f433d5d946eaf8f0d2f6fd18c144 Gbp-Pq: Name gcc-12 --- src/worker.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/worker.cc b/src/worker.cc index d24b5cd..ed6a374 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -2989,8 +2989,9 @@ bool DiskThread::AsyncDiskIO(IoOp op, int fd, void *buf, int64 size, errorcount_++; os_->ErrorReport(device_name_.c_str(), operations[op].error_str, 1); - if (event.res < 0) { - switch (event.res) { + int64 result = static_cast(event.res); + if (result < 0) { + switch (result) { case -EIO: logprintf(0, "Hardware Error: Low-level I/O error while doing %s to " "sectors starting at %lld on disk %s (thread %d).\n", -- cgit v1.2.3 From 2148381b2dac5ec53c4a346b258f54f58ba9064d Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sun, 9 Sep 2018 05:34:37 +0200 Subject: Allow to override build date with SOURCE_DATE_EPOCH (Closes: #831587) in order to make builds reproducible. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. This date call works with all variants of date (GNU,BSD,Solaris). Also do not capture build user+host in this case to allow to get the same build results anywhere and anytime. Gbp-Pq: Name allow-to-override-build-date-with-source.patch --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 603ba73..818d357 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,13 @@ timestamp=$(date) AC_MSG_CHECKING([current timestamp]) AC_MSG_RESULT([$timestamp]) +if test -n "$SOURCE_DATE_EPOCH" +then + timestamp=$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u) + username=reproducible + hostname=reproducible +fi + AC_DEFINE_UNQUOTED([STRESSAPPTEST_TIMESTAMP], "$username @ $hostname on $timestamp", [Timestamp when ./configure was executed]) -- cgit v1.2.3 From 539d6a57794b761b4b3170e1a9d7ba76aa38fa61 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 8 Apr 2021 20:38:30 +0200 Subject: Fix FTCBFS. (Closes: #986653) Gbp-Pq: Name fix-ftcbfs.-closes-986653.patch --- configure.ac | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 818d357..82de856 100644 --- a/configure.ac +++ b/configure.ac @@ -127,26 +127,9 @@ AC_SEARCH_LIBS([io_setup], [aio]) AC_CHECK_HEADERS([sys/shm.h]) AC_SEARCH_LIBS([shm_open], [rt]) -AC_MSG_CHECKING(for pthread_barrier) -AC_CACHE_VAL( - ac_cv_func_pthread_barrier, - AC_TRY_RUN( - [ - #include - int main(void) - { - pthread_barrier_t t; - return 0; - } - ], - ac_cv_func_pthread_barrier=yes, - ac_cv_func_pthread_barrier=no - ) -) -AC_MSG_RESULT($ac_cv_func_pthread_barrier) -if test "$ac_cv_func_pthread_barrier" = "yes"; then +AC_CHECK_TYPE([pthread_barrier_t],[ AC_DEFINE(HAVE_PTHREAD_BARRIER, [1], [Define to 1 if the system has `pthread_barrier'.]) -fi +],[],[#include ]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL -- cgit v1.2.3 From 36581a7d54b9913b1a25ced3b98471d2908c1a49 Mon Sep 17 00:00:00 2001 From: Pierre Blanc Date: Thu, 24 Aug 2023 14:42:39 +0200 Subject: Fix armhf support patch to look for "arm" instead of "armv7l", Last-Update: 2012-12-02 since configure is looking at the triplet, not uname output. Gbp-Pq: Name armhf_support --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ede7d26..fe8fd40 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AS_CASE(["$host_cpu"], AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], [Defined if the target CPU is PowerPC]) ], - [*armv7a*], [ + [*arm*], [ AC_DEFINE([STRESSAPPTEST_CPU_ARMV7A],[], [Defined if the target CPU is armv7a]) ], -- cgit v1.2.3 From 01bd1ac4be07fb65a7fac35022e011b95019c26e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 12 Jun 2012 01:01:39 +0200 Subject: Support building on i486 Gbp-Pq: Name support_i486_builds --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index fe8fd40..459d8c6 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,10 @@ AS_CASE(["$host_cpu"], AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) ], + [*i486*], [ + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i486]) + ], [*powerpc*], [ AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], [Defined if the target CPU is PowerPC]) -- cgit v1.2.3 From 092cc033570817f009787d44a89b5ad2aae4c9a7 Mon Sep 17 00:00:00 2001 From: Pierre Blanc Date: Thu, 24 Aug 2023 14:42:39 +0200 Subject: support_i586_builds Gbp-Pq: Name support_i586_builds --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 459d8c6..9eed433 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,10 @@ AS_CASE(["$host_cpu"], AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) ], + [*i586*], [ + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i586]) + ], [*i486*], [ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i486]) -- cgit v1.2.3 From 5c832c4bcedf7d1d48fcde75e3478814589d7e5b Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sun, 9 Sep 2018 05:34:37 +0200 Subject: Allow to override build date with SOURCE_DATE_EPOCH (Closes: #831587) in order to make builds reproducible. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. This date call works with all variants of date (GNU,BSD,Solaris). Also do not capture build user+host in this case to allow to get the same build results anywhere and anytime. Gbp-Pq: Name allow-to-override-build-date-with-source.patch --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 9eed433..2681b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,13 @@ timestamp=$(date) AC_MSG_CHECKING([current timestamp]) AC_MSG_RESULT([$timestamp]) +if test -n "$SOURCE_DATE_EPOCH" +then + timestamp=$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u) + username=reproducible + hostname=reproducible +fi + AC_DEFINE_UNQUOTED([STRESSAPPTEST_TIMESTAMP], "$username @ $hostname on $timestamp", [Timestamp when ./configure was executed]) -- cgit v1.2.3 From 7b717d947d3746ddf626bd1de93f5797cca63f7c Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 8 Apr 2021 20:38:30 +0200 Subject: Fix FTCBFS. (Closes: #986653) Gbp-Pq: Name fix-ftcbfs.-closes-986653.patch --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 2681b5d..f1ab99b 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,9 @@ AC_SEARCH_LIBS([io_setup], [aio]) AC_CHECK_HEADERS([sys/shm.h]) AC_SEARCH_LIBS([shm_open], [rt]) +AC_CHECK_TYPE([pthread_barrier_t],[ + AC_DEFINE(HAVE_PTHREAD_BARRIER, [1], [Define to 1 if the system has `pthread_barrier'.]) +],[],[#include ]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL -- cgit v1.2.3 From d89bb3003e9c78b86e1f0aa69631b117b57a40c6 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 24 Aug 2023 14:54:02 +0200 Subject: Include cstdint to build with GCC-13 [git-debrebase split: mixed commit: upstream part] --- src/os.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/os.h b/src/os.h index 7dd69b8..fd95af9 100644 --- a/src/os.h +++ b/src/os.h @@ -20,6 +20,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3 From b7b007c23b9fb9ad188d78600e04ce3c9bf55731 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 24 Aug 2023 15:37:26 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...0006-Include-cstdint-to-build-with-GCC-13.patch | 21 +++++++++++++ .../allow-to-override-build-date-with-source.patch | 36 ++++++++++++++++++++++ debian/patches/armhf_support | 24 +++++++++++++++ debian/patches/fix-ftcbfs.-closes-986653.patch | 22 +++++++++++++ debian/patches/series | 6 ++++ debian/patches/support_i486_builds | 23 ++++++++++++++ debian/patches/support_i586_builds | 23 ++++++++++++++ 7 files changed, 155 insertions(+) create mode 100644 debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch create mode 100644 debian/patches/allow-to-override-build-date-with-source.patch create mode 100644 debian/patches/armhf_support create mode 100644 debian/patches/fix-ftcbfs.-closes-986653.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/support_i486_builds create mode 100644 debian/patches/support_i586_builds diff --git a/debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch b/debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch new file mode 100644 index 0000000..9743b11 --- /dev/null +++ b/debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch @@ -0,0 +1,21 @@ +From: Emanuele Rocca +Date: Thu, 24 Aug 2023 14:54:02 +0200 +Subject: Include cstdint to build with GCC-13 + +[git-debrebase split: mixed commit: upstream part] +--- + src/os.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/os.h b/src/os.h +index 7dd69b8..fd95af9 100644 +--- a/src/os.h ++++ b/src/os.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/debian/patches/allow-to-override-build-date-with-source.patch b/debian/patches/allow-to-override-build-date-with-source.patch new file mode 100644 index 0000000..84edc28 --- /dev/null +++ b/debian/patches/allow-to-override-build-date-with-source.patch @@ -0,0 +1,36 @@ +From: "Bernhard M. Wiedemann" +Date: Sun, 9 Sep 2018 05:34:37 +0200 +Subject: Allow to override build date with SOURCE_DATE_EPOCH + +(Closes: #831587) + +in order to make builds reproducible. +See https://reproducible-builds.org/ for why this is good +and https://reproducible-builds.org/specs/source-date-epoch/ +for the definition of this variable. +This date call works with all variants of date (GNU,BSD,Solaris). + +Also do not capture build user+host in this case +to allow to get the same build results anywhere and anytime. +--- + configure.ac | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 9eed433..2681b5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,6 +96,13 @@ timestamp=$(date) + AC_MSG_CHECKING([current timestamp]) + AC_MSG_RESULT([$timestamp]) + ++if test -n "$SOURCE_DATE_EPOCH" ++then ++ timestamp=$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u) ++ username=reproducible ++ hostname=reproducible ++fi ++ + AC_DEFINE_UNQUOTED([STRESSAPPTEST_TIMESTAMP], + "$username @ $hostname on $timestamp", + [Timestamp when ./configure was executed]) diff --git a/debian/patches/armhf_support b/debian/patches/armhf_support new file mode 100644 index 0000000..9652b48 --- /dev/null +++ b/debian/patches/armhf_support @@ -0,0 +1,24 @@ +From: Pierre Blanc +Date: Thu, 24 Aug 2023 14:42:39 +0200 +Subject: Fix armhf support patch to look for "arm" instead of "armv7l", + +Last-Update: 2012-12-02 + +since configure is looking at the triplet, not uname output. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ede7d26..fe8fd40 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AS_CASE(["$host_cpu"], + AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], + [Defined if the target CPU is PowerPC]) + ], +- [*armv7a*], [ ++ [*arm*], [ + AC_DEFINE([STRESSAPPTEST_CPU_ARMV7A],[], + [Defined if the target CPU is armv7a]) + ], diff --git a/debian/patches/fix-ftcbfs.-closes-986653.patch b/debian/patches/fix-ftcbfs.-closes-986653.patch new file mode 100644 index 0000000..5d0b1a5 --- /dev/null +++ b/debian/patches/fix-ftcbfs.-closes-986653.patch @@ -0,0 +1,22 @@ +From: Helmut Grohne +Date: Thu, 8 Apr 2021 20:38:30 +0200 +Subject: Fix FTCBFS. (Closes: #986653) + +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2681b5d..f1ab99b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,6 +129,9 @@ AC_SEARCH_LIBS([io_setup], [aio]) + AC_CHECK_HEADERS([sys/shm.h]) + AC_SEARCH_LIBS([shm_open], [rt]) + ++AC_CHECK_TYPE([pthread_barrier_t],[ ++ AC_DEFINE(HAVE_PTHREAD_BARRIER, [1], [Define to 1 if the system has `pthread_barrier'.]) ++],[],[#include ]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..75c25d4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +armhf_support +support_i486_builds +support_i586_builds +allow-to-override-build-date-with-source.patch +fix-ftcbfs.-closes-986653.patch +0006-Include-cstdint-to-build-with-GCC-13.patch diff --git a/debian/patches/support_i486_builds b/debian/patches/support_i486_builds new file mode 100644 index 0000000..ccd82b7 --- /dev/null +++ b/debian/patches/support_i486_builds @@ -0,0 +1,23 @@ +From: Michael Prokop +Date: Tue, 12 Jun 2012 01:01:39 +0200 +Subject: Support building on i486 + +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index fe8fd40..459d8c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,10 @@ AS_CASE(["$host_cpu"], + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i686]) + ], ++ [*i486*], [ ++ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ [Defined if the target CPU is i486]) ++ ], + [*powerpc*], [ + AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], + [Defined if the target CPU is PowerPC]) diff --git a/debian/patches/support_i586_builds b/debian/patches/support_i586_builds new file mode 100644 index 0000000..588d557 --- /dev/null +++ b/debian/patches/support_i586_builds @@ -0,0 +1,23 @@ +From: Pierre Blanc +Date: Thu, 24 Aug 2023 14:42:39 +0200 +Subject: support_i586_builds + +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 459d8c6..9eed433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,10 @@ AS_CASE(["$host_cpu"], + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i686]) + ], ++ [*i586*], [ ++ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ [Defined if the target CPU is i586]) ++ ], + [*i486*], [ + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i486]) -- cgit v1.2.3 From b5d090e8c55893eae1484cb44bfe13b11b1aa6d6 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 24 Aug 2023 15:39:38 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...0006-Include-cstdint-to-build-with-GCC-13.patch | 21 +++++++++++++ .../allow-to-override-build-date-with-source.patch | 36 ++++++++++++++++++++++ debian/patches/armhf_support | 24 +++++++++++++++ debian/patches/fix-ftcbfs.-closes-986653.patch | 22 +++++++++++++ debian/patches/series | 6 ++++ debian/patches/support_i486_builds | 23 ++++++++++++++ debian/patches/support_i586_builds | 23 ++++++++++++++ 7 files changed, 155 insertions(+) create mode 100644 debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch create mode 100644 debian/patches/allow-to-override-build-date-with-source.patch create mode 100644 debian/patches/armhf_support create mode 100644 debian/patches/fix-ftcbfs.-closes-986653.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/support_i486_builds create mode 100644 debian/patches/support_i586_builds diff --git a/debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch b/debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch new file mode 100644 index 0000000..9743b11 --- /dev/null +++ b/debian/patches/0006-Include-cstdint-to-build-with-GCC-13.patch @@ -0,0 +1,21 @@ +From: Emanuele Rocca +Date: Thu, 24 Aug 2023 14:54:02 +0200 +Subject: Include cstdint to build with GCC-13 + +[git-debrebase split: mixed commit: upstream part] +--- + src/os.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/os.h b/src/os.h +index 7dd69b8..fd95af9 100644 +--- a/src/os.h ++++ b/src/os.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/debian/patches/allow-to-override-build-date-with-source.patch b/debian/patches/allow-to-override-build-date-with-source.patch new file mode 100644 index 0000000..84edc28 --- /dev/null +++ b/debian/patches/allow-to-override-build-date-with-source.patch @@ -0,0 +1,36 @@ +From: "Bernhard M. Wiedemann" +Date: Sun, 9 Sep 2018 05:34:37 +0200 +Subject: Allow to override build date with SOURCE_DATE_EPOCH + +(Closes: #831587) + +in order to make builds reproducible. +See https://reproducible-builds.org/ for why this is good +and https://reproducible-builds.org/specs/source-date-epoch/ +for the definition of this variable. +This date call works with all variants of date (GNU,BSD,Solaris). + +Also do not capture build user+host in this case +to allow to get the same build results anywhere and anytime. +--- + configure.ac | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 9eed433..2681b5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,6 +96,13 @@ timestamp=$(date) + AC_MSG_CHECKING([current timestamp]) + AC_MSG_RESULT([$timestamp]) + ++if test -n "$SOURCE_DATE_EPOCH" ++then ++ timestamp=$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u) ++ username=reproducible ++ hostname=reproducible ++fi ++ + AC_DEFINE_UNQUOTED([STRESSAPPTEST_TIMESTAMP], + "$username @ $hostname on $timestamp", + [Timestamp when ./configure was executed]) diff --git a/debian/patches/armhf_support b/debian/patches/armhf_support new file mode 100644 index 0000000..9652b48 --- /dev/null +++ b/debian/patches/armhf_support @@ -0,0 +1,24 @@ +From: Pierre Blanc +Date: Thu, 24 Aug 2023 14:42:39 +0200 +Subject: Fix armhf support patch to look for "arm" instead of "armv7l", + +Last-Update: 2012-12-02 + +since configure is looking at the triplet, not uname output. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ede7d26..fe8fd40 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AS_CASE(["$host_cpu"], + AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], + [Defined if the target CPU is PowerPC]) + ], +- [*armv7a*], [ ++ [*arm*], [ + AC_DEFINE([STRESSAPPTEST_CPU_ARMV7A],[], + [Defined if the target CPU is armv7a]) + ], diff --git a/debian/patches/fix-ftcbfs.-closes-986653.patch b/debian/patches/fix-ftcbfs.-closes-986653.patch new file mode 100644 index 0000000..5d0b1a5 --- /dev/null +++ b/debian/patches/fix-ftcbfs.-closes-986653.patch @@ -0,0 +1,22 @@ +From: Helmut Grohne +Date: Thu, 8 Apr 2021 20:38:30 +0200 +Subject: Fix FTCBFS. (Closes: #986653) + +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2681b5d..f1ab99b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,6 +129,9 @@ AC_SEARCH_LIBS([io_setup], [aio]) + AC_CHECK_HEADERS([sys/shm.h]) + AC_SEARCH_LIBS([shm_open], [rt]) + ++AC_CHECK_TYPE([pthread_barrier_t],[ ++ AC_DEFINE(HAVE_PTHREAD_BARRIER, [1], [Define to 1 if the system has `pthread_barrier'.]) ++],[],[#include ]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..75c25d4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +armhf_support +support_i486_builds +support_i586_builds +allow-to-override-build-date-with-source.patch +fix-ftcbfs.-closes-986653.patch +0006-Include-cstdint-to-build-with-GCC-13.patch diff --git a/debian/patches/support_i486_builds b/debian/patches/support_i486_builds new file mode 100644 index 0000000..ccd82b7 --- /dev/null +++ b/debian/patches/support_i486_builds @@ -0,0 +1,23 @@ +From: Michael Prokop +Date: Tue, 12 Jun 2012 01:01:39 +0200 +Subject: Support building on i486 + +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index fe8fd40..459d8c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,10 @@ AS_CASE(["$host_cpu"], + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i686]) + ], ++ [*i486*], [ ++ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ [Defined if the target CPU is i486]) ++ ], + [*powerpc*], [ + AC_DEFINE([STRESSAPPTEST_CPU_PPC],[], + [Defined if the target CPU is PowerPC]) diff --git a/debian/patches/support_i586_builds b/debian/patches/support_i586_builds new file mode 100644 index 0000000..588d557 --- /dev/null +++ b/debian/patches/support_i586_builds @@ -0,0 +1,23 @@ +From: Pierre Blanc +Date: Thu, 24 Aug 2023 14:42:39 +0200 +Subject: support_i586_builds + +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 459d8c6..9eed433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,10 @@ AS_CASE(["$host_cpu"], + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i686]) + ], ++ [*i586*], [ ++ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ [Defined if the target CPU is i586]) ++ ], + [*i486*], [ + AC_DEFINE([STRESSAPPTEST_CPU_I686],[], + [Defined if the target CPU is i486]) -- cgit v1.2.3 From c7e33489b7bb376493d9eb98ee2d655005f24512 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Wed, 30 Aug 2023 12:52:46 +0200 Subject: Add dgit/sid as the branch name to Vcs-git --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fbf795c..d284329 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +stressapptest (1.0.9-2) UNRELEASED; urgency=medium + + * Add dgit/sid as the branch name to Vcs-git. + + -- Emanuele Rocca Wed, 30 Aug 2023 12:51:58 +0200 + stressapptest (1.0.9-1) unstable; urgency=medium [ Jelmer Vernooij ] diff --git a/debian/control b/debian/control index cfb5db2..b1808d6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Emanuele Rocca Build-Depends: debhelper (>= 13), libaio-dev Standards-Version: 4.6.2 Homepage: https://github.com/stressapptest/stressapptest -Vcs-git: https://salsa.debian.org/debian/stressapptest.git +Vcs-git: https://salsa.debian.org/debian/stressapptest.git -b dgit/sid Vcs-Browser: https://salsa.debian.org/debian/stressapptest Package: stressapptest -- cgit v1.2.3 From 62efaaa05b77580904bb7debfd072e19ec252810 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Wed, 30 Aug 2023 12:58:18 +0200 Subject: Set Architecture: any --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d284329..13b08c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -stressapptest (1.0.9-2) UNRELEASED; urgency=medium +stressapptest (1.0.9-2) unstable; urgency=medium + * Set Architecture: any (Closes: #599016) * Add dgit/sid as the branch name to Vcs-git. -- Emanuele Rocca Wed, 30 Aug 2023 12:51:58 +0200 diff --git a/debian/control b/debian/control index b1808d6..a7b0411 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-git: https://salsa.debian.org/debian/stressapptest.git -b dgit/sid Vcs-Browser: https://salsa.debian.org/debian/stressapptest Package: stressapptest -Architecture: amd64 arm64 armhf armel i386 powerpc +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: stress test application for simulating high load situations Stressful Application Test (or stressapptest, its unix name) tries to maximize -- cgit v1.2.3 From b5afc5b1ae7effc0f23fca06568fab5fc18936cb Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Mon, 11 Sep 2023 13:22:58 +0200 Subject: Add autopkgtest --- debian/changelog | 6 ++++++ debian/tests/control | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 debian/tests/control diff --git a/debian/changelog b/debian/changelog index 13b08c6..76d2f21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +stressapptest (1.0.9-3) unstable; urgency=medium + + * Add autopkgtest. + + -- Emanuele Rocca Mon, 11 Sep 2023 13:22:24 +0200 + stressapptest (1.0.9-2) unstable; urgency=medium * Set Architecture: any (Closes: #599016) diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..ac8d322 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Test-Command: stressapptest -C `nproc` -M 256 +Depends: @ -- cgit v1.2.3