[Pkg-samba-maint] [Git][samba-team/samba][master] d/rules: make workaround for #1021371 a bit more explicit and easier to find

[Michael Tokarev (@mjt)]

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


Commits:
be426a4f by Michael Tokarev at 2022-10-08T15:21:46+03:00
d/rules: make workaround for #1021371 a bit more explicit and easier to find

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -19,6 +19,10 @@ LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}+samba$(subst +dfsg,,${DEB_VERSION_
 LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
 LDB_PACKAGES := libldb2 libldb-dev ldb-tools python3-ldb python3-ldb-dev
 
+# #1021371: we only need the single "version" symbol LDB_2.4.4 in the library
+# should be removed for bookworm+. Also LDB_2.4.4 in d/libldb2.symbols
+EXTRA_ABI_VERSION_FILES = lib/ldb/ABI/ldb-2.4.4.sigs
+
 V = 1
 WAF := PYTHONHASHSEED=1 ${PYTHON} ./buildtools/bin/waf \
 	$(subst parallel=,-j,$(filter parallel=%,${DEB_BUILD_OPTIONS}))
@@ -109,7 +113,7 @@ 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 ${EXTRA_ABI_VERSION_FILES}
 	touch $@
 
 build-arch: bin/built.stamp
@@ -322,4 +326,4 @@ override_dh_gencontrol:
 clean:
 	# see also debian/clean
 	dh_clean bin/ testbuild/
-	rm -f lib/ldb/ABI/ldb-2.4.4.sigs
+	rm -f ${EXTRA_ABI_VERSION_FILES}



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/be426a4f33e957b710dc016086f46d88fe4405c1

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/be426a4f33e957b710dc016086f46d88fe4405c1
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/20221008/ab6b5643/attachment-0001.htm>