Package: sphde
Version: 1.4.0-3
Severity: serious
Tags: patch
Justification: FTBFS
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu kinetic ubuntu-patch
Hi Frédéric,
sphde 1.4.0-3 has been stuck in unstable for 230 days because it fails to
build on several architectures. The same problem affects Ubuntu, so I've
had a look at resolving the build failure.
It appears that of all the patches you added in this version, only the first
patch is actually required to fix the build failure with current gcc (at
least per my tests in Ubuntu); and the third of these patches is the one
that introduces the test hang on armhf. Removing this patch is sufficient
to let the package build on all archs in Ubuntu, and hopefully this is true
for Debian as well.
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru
sphde-1.4.0/debian/patches/0009-Suppress-bogus-array-bounds-warning-with-GCC-12.patch
sphde-1.4.0/debian/patches/0009-Suppress-bogus-array-bounds-warning-with-GCC-12.patch
---
sphde-1.4.0/debian/patches/0009-Suppress-bogus-array-bounds-warning-with-GCC-12.patch
2021-11-18 08:15:46.000000000 -0800
+++
sphde-1.4.0/debian/patches/0009-Suppress-bogus-array-bounds-warning-with-GCC-12.patch
2022-07-06 17:18:10.000000000 -0700
@@ -23,13 +23,13 @@
src/sassim.cpp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
-diff --git a/src/sassim.cpp b/src/sassim.cpp
-index 53bda2a..1410919 100644
---- a/src/sassim.cpp
-+++ b/src/sassim.cpp
-@@ -36,6 +36,10 @@
+Index: sphde-1.4.0/src/sassim.cpp
+===================================================================
+--- sphde-1.4.0.orig/src/sassim.cpp
++++ sphde-1.4.0/src/sassim.cpp
+@@ -35,6 +35,10 @@
+ #include <errno.h>
#include <pthread.h>
- #include <semaphore.h>
+#if __GNUC__
+#include <features.h>
@@ -38,7 +38,7 @@
#include "sasio.h"
#include "freenode.h"
#include "sasanchr.h"
-@@ -688,6 +692,15 @@ destroySASSem (SASAnchor_t * anchor)
+@@ -484,6 +488,15 @@
#endif
}
@@ -54,7 +54,7 @@
static void
initRegion ()
{
-@@ -769,6 +782,10 @@ initRegion ()
+@@ -565,6 +578,10 @@
initSASSem (anchor);
}
diff -Nru sphde-1.4.0/debian/patches/0010-Fixes-for-build-test-failure-61.patch
sphde-1.4.0/debian/patches/0010-Fixes-for-build-test-failure-61.patch
--- sphde-1.4.0/debian/patches/0010-Fixes-for-build-test-failure-61.patch
2021-11-18 08:15:46.000000000 -0800
+++ sphde-1.4.0/debian/patches/0010-Fixes-for-build-test-failure-61.patch
2022-07-06 16:13:17.000000000 -0700
@@ -27,15 +27,14 @@
src/tests/sassim_t.c | 3 +--
4 files changed, 54 insertions(+), 4 deletions(-)
-diff --git a/src/sasshm.c b/src/sasshm.c
-index 402e7e0..4a1e01a 100644
---- a/src/sasshm.c
-+++ b/src/sasshm.c
-@@ -106,6 +106,56 @@ SASAllocateShmID (key_t key_id, void *addr, long size)
- return (shm_id);
+Index: sphde-1.4.0/src/sasshm.c
+===================================================================
+--- sphde-1.4.0.orig/src/sasshm.c
++++ sphde-1.4.0/src/sasshm.c
+@@ -107,6 +107,56 @@
}
-+int
+ int
+SASAllocateShmID_clear (key_t key_id, void *addr, long size)
+{
+ int shm_id;
@@ -85,14 +84,15 @@
+ return (shm_id);
+}
+
- int
++int
SASAllocateShmName (char *key_name, void *addr, long size)
{
-diff --git a/src/sasshm.h b/src/sasshm.h
-index e45f28e..40599ff 100644
---- a/src/sasshm.h
-+++ b/src/sasshm.h
-@@ -36,6 +36,8 @@ extern __C__ int SASAllocateShm( void* addr, long size );
+ key_t shm_key;
+Index: sphde-1.4.0/src/sasshm.h
+===================================================================
+--- sphde-1.4.0.orig/src/sasshm.h
++++ sphde-1.4.0/src/sasshm.h
+@@ -36,6 +36,8 @@
extern __C__ int SASAllocateShmID(key_t key_id, void* addr, long size );
@@ -101,11 +101,11 @@
extern __C__ int SASAllocateShmName(char *key_name, void* addr, long size );
extern __C__ int SASAllocateShmNameProj( char* key_name, char proj,
-diff --git a/src/tests/sascompoundheap_t.c b/src/tests/sascompoundheap_t.c
-index 04543bb..f1b9f50 100644
---- a/src/tests/sascompoundheap_t.c
-+++ b/src/tests/sascompoundheap_t.c
-@@ -122,14 +122,13 @@ sassim_compound_heap_test1 ()
+Index: sphde-1.4.0/src/tests/sascompoundheap_t.c
+===================================================================
+--- sphde-1.4.0.orig/src/tests/sascompoundheap_t.c
++++ sphde-1.4.0/src/tests/sascompoundheap_t.c
+@@ -122,14 +122,13 @@
sasshm_t lock_mem = 0;
key_t test_heap = 1234;
@@ -121,11 +121,11 @@
compoundHeap =
SASCompoundHeapInit (compoundHeap, __SAS_SHMAP_MAX, block__Size512, 0);
SASSIM_PRINT_MSG ("SASCompoundHeapInit (%p, %ld) success", compoundHeap,
-diff --git a/src/tests/sassim_t.c b/src/tests/sassim_t.c
-index 6741d2e..22ebdf8 100644
---- a/src/tests/sassim_t.c
-+++ b/src/tests/sassim_t.c
-@@ -394,14 +394,13 @@ sassim_heap_test2 ()
+Index: sphde-1.4.0/src/tests/sassim_t.c
+===================================================================
+--- sphde-1.4.0.orig/src/tests/sassim_t.c
++++ sphde-1.4.0/src/tests/sassim_t.c
+@@ -394,14 +394,13 @@
sasshm_t lock_mem = 0;
key_t test_heap = 4321;
diff -Nru sphde-1.4.0/debian/patches/series sphde-1.4.0/debian/patches/series
--- sphde-1.4.0/debian/patches/series 2021-11-18 08:15:46.000000000 -0800
+++ sphde-1.4.0/debian/patches/series 2022-07-06 17:18:00.000000000 -0700
@@ -5,6 +5,5 @@
0005-Fix-FTBFS-on-s390x.patch
0006-Fix-this-pointer-null-warning-for-GCC11.patch
0007-Add-operator-new-delete-to-uLongTreeNode-class.patch
-0008-Allow-the-Used-block-List-tree-to-combine-adjacent-b.patch
0009-Suppress-bogus-array-bounds-warning-with-GCC-12.patch
0010-Fixes-for-build-test-failure-61.patch
