Control: tags 972372 + patch
Control: tags 972372 + pending
Dear maintainer,
I've prepared an NMU for sfepy (versioned as 2019.4-2.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
SR
diff -Nru sfepy-2019.4/debian/changelog sfepy-2019.4/debian/changelog
--- sfepy-2019.4/debian/changelog 2020-01-21 11:29:55.0 -0800
+++ sfepy-2019.4/debian/changelog 2020-10-17 13:02:43.0 -0700
@@ -1,3 +1,11 @@
+sfepy (2019.4-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Declare internal inline functions "static inline", fixing FTBFS on 32-bit
+archs (Closes: #972372).
+
+ -- Stefano Rivera Sat, 17 Oct 2020 13:02:43 -0700
+
sfepy (2019.4-2) unstable; urgency=medium
* [40073a3] Trim trailing whitespace.
diff -Nru sfepy-2019.4/debian/patches/extern-inline.patch sfepy-2019.4/debian/patches/extern-inline.patch
--- sfepy-2019.4/debian/patches/extern-inline.patch 1969-12-31 16:00:00.0 -0800
+++ sfepy-2019.4/debian/patches/extern-inline.patch 2020-10-17 12:50:17.0 -0700
@@ -0,0 +1,35 @@
+Declare internal inline functions "static inline"
+
+Avoids FTBFS on 32-bit platforms where an undefined symbol _aux_hex was
+referenced from mesh.o.
+
+Author: Stefano Rivera
+Bug-Debian: https://bugs.debian.org/972372
+Bug-Upstream: https://github.com/sfepy/sfepy/issues/651
+--- a/sfepy/discrete/common/extmods/mesh.c
b/sfepy/discrete/common/extmods/mesh.c
+@@ -910,13 +910,13 @@
+ return(RET_OK);
+ }
+
+-inline float64 _det3x3(float64 j[9])
++static inline float64 _det3x3(float64 j[9])
+ {
+ return (j[0]*j[4]*j[8] + j[3]*j[7]*j[2] + j[1]*j[5]*j[6]
+ - j[2]*j[4]*j[6] - j[5]*j[7]*j[0] - j[1]*j[3]*j[8]);
+ }
+
+-inline float64 _tri_area(float64 *coors, uint32 *indices, uint32 nc)
++static inline float64 _tri_area(float64 *coors, uint32 *indices, uint32 nc)
+ {
+ #define VS(ic, id) (coors[nc*indices[ic] + id])
+
+@@ -945,7 +945,7 @@
+ #undef VS
+ }
+
+-inline float64 _aux_hex(float64 *coors, uint32 *indices, uint32 nc,
++static inline float64 _aux_hex(float64 *coors, uint32 *indices, uint32 nc,
+ int32 h, int32 i, int32 j, int32 k)
+ {
+ #define VS(ic, id) (coors[nc*indices[ic] + id])
diff -Nru sfepy-2019.4/debian/patches/series sfepy-2019.4/debian/patches/series
--- sfepy-2019.4/debian/patches/series 2020-01-21 11:29:55.0 -0800
+++ sfepy-2019.4/debian/patches/series 2020-10-17 12:46:14.0 -0700
@@ -1 +1,2 @@
20_reproducible_build.patch
+extern-inline.patch
