[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: disable ceph support on ppc64 and x32 (#1020781)

[Michael Tokarev (@mjt)]

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


Commits:
a7865052 by John Paul Adrian Glaubitz at 2022-10-03T10:57:51+03:00
disable ceph support on ppc64 and x32 (#1020781)

ceph currently FTBFS on ppc64 and x32. Since the build issues don't
seem to be trivial to fix, it would be a good idea to disable ceph
support on ppc64 and x32 for the time being.

- - - - -
77a789a6 by Michael Tokarev at 2022-10-08T00:42:23+03:00
introduce LDB_2.4.4 version symbol (#1021371)

create an empty ABI file just to make the scripts run
during the build stage to introduce LDB_2.4.4 version
symbol into libldb.so, and remove this empty file in
the clean target. It is a bit hackish but works fine.

This is only needed to upgrade from bullseye to bookworm,
from 4.13.13+dfsg-1~deb11u5+ to the next release, 4.16+.
Remove this for bookworm+.

- - - - -


3 changed files:

- debian/control
- debian/libldb2.symbols
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -37,7 +37,7 @@ Build-Depends-Arch:
 	libblkid-dev,
 	libbsd-dev,
 	libcap-dev [linux-any],
-	libcephfs-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32],
+	libcephfs-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
 	libcmocka-dev (>= 1.1.3),
 	libcups2-dev,
 	libdbus-1-dev,


=====================================
debian/libldb2.symbols
=====================================
@@ -74,6 +74,7 @@ libldb.so.2 #PACKAGE# #MINVER#
  LDB_2.2.0 at LDB_2.2.0 2:2.2.0
  LDB_2.4.0 at LDB_2.4.0 2:2.5.0
  LDB_2.4.1 at LDB_2.4.1 2:2.5.0
+ LDB_2.4.4 at LDB_2.4.4 2:2.4.4
  LDB_2.5.0 at LDB_2.5.0 2:2.5.0
  LDB_2.5.1 at LDB_2.5.1 2:2.5.1
  LDB_2.5.2 at LDB_2.5.2 2:2.5.2


=====================================
debian/rules
=====================================
@@ -64,7 +64,7 @@ conf_args = \
 
 WITH_CEPH = yes
 # Ceph is not available on all platforms
-ifeq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32, $(DEB_HOST_ARCH)))
+ifeq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x, $(DEB_HOST_ARCH)))
     WITH_CEPH =
 endif
 # Ubuntu i386 binary compatibility only effort: No Ceph
@@ -108,6 +108,8 @@ configure: bin/configured.stamp
 bin/configured.stamp:
 	${WAF} -j1 configure -C ${conf_args} || \
 	  { $(if ${V},echo "==== contents of config.log:"; cat bin/config.log;) false; }
+# #1021371: we only need the single "version" symbol LDB_2.4.4 in the library
+	touch lib/ldb/ABI/ldb-2.4.4.sigs
 	touch $@
 
 build-arch: bin/built.stamp
@@ -320,3 +322,4 @@ override_dh_gencontrol:
 clean:
 	# see also debian/clean
 	dh_clean bin/ testbuild/
+	rm -f lib/ldb/ABI/ldb-2.4.4.sigs



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/028d3bef1355be6b9c0b62d519c2cddca5172da0...77a789a67848983074bbb7fd4815bd2fa2bd78f9

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/028d3bef1355be6b9c0b62d519c2cddca5172da0...77a789a67848983074bbb7fd4815bd2fa2bd78f9
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/20221007/9a647124/attachment-0001.htm>