[Pkg-samba-maint] [Git][samba-team/samba][bookworm] 4 commits: d/rules: include -latomic gcc issue workaround for select arches

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch bookworm at Debian Samba Team / samba


Commits:
1caa4f46 by Michael Tokarev at 2023-07-09T09:54:59+03:00
d/rules: include -latomic gcc issue workaround for select arches

- - - - -
82da757b by Michael Tokarev at 2023-07-09T09:55:22+03:00
d/rules: query for DEB_HOST_ARCH, not DEB_HOST_ARCH_CPU, for -latomic workaround

- - - - -
9159665a by Michael Tokarev at 2023-07-09T09:56:08+03:00
d/rules: add comment about -latomic gcc issue and drop --as-needed there since it is already in use

- - - - -
728732b6 by Michael Tokarev at 2023-07-09T14:26:59+03:00
update changelog; upload version 4.17.9+dfsg-0+deb12u2 to bookworm

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+samba (2:4.17.9+dfsg-0+deb12u2) bookworm; urgency=medium
+
+  * link with -latomic explicitly on a few architectures where gcc misses it
+    (notable armel & mipsel), to fix FTBFS there, - the same as on sid.
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sun, 09 Jul 2023 09:44:29 +0300
+
 samba (2:4.17.9+dfsg-0+deb12u1) bookworm-proposed-updates; urgency=medium
 
   * d/copyright: filter out autogenerated manpages from the upstream source


=====================================
debian/rules
=====================================
@@ -103,6 +103,20 @@ with-ceph =
 with-glusterfs =
 endif
 
+ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
+# on these platforms gcc does not link with -latomic, resulting in
+#   third_party/heimdal/lib/krb5/krcache.c.55.o: in function `krcc_get_principal':
+#   third_party/heimdal/lib/krb5/krcache.c:1395: undefined reference to `__atomic_load_8'
+#     ids.krcu_cache_and_princ_id = heim_base_atomic_load(&data->krc_cache_and_principal_id);
+#   third_party/heimdal/lib/base/heimbase-atomics.h:
+#     #include <stdatomic.h>
+#     #define heim_base_atomic_load(x)        atomic_load((x))
+# include a workaround for now
+# (-latomic and <stdatomic.h> comes from gcc, --as-needed is already in use)
+LDFLAGS := ${LDFLAGS} -latomic
+endif
+
 config-args += $(if ${with-ceph},\
 	  --enable-cephfs --enable-ceph-reclock,\
 	  --disable-cephfs)



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1af3882e33abe7a85fbfc8876170333709794c14...728732b61c04d16c4d1682c13d651a038f713875

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1af3882e33abe7a85fbfc8876170333709794c14...728732b61c04d16c4d1682c13d651a038f713875
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20230709/a7af8e9f/attachment-0001.htm>