Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package libcxl The version in testing has bug #987636 which is a FTBFS because of a regression in make 4.3 . Upstream libcxl has implemented a workaround which I pulled as well a cosmetic patch for debian/rules that was pushed previously in the git tree by another Debian Developer. The build now works fine : https://buildd.debian.org/status/package.php?p=libcxl See attached the debdiff for the changes. unblock libcxl/1.7-2 Thanks! Regards F.
diff -Nru libcxl-1.7/debian/changelog libcxl-1.7/debian/changelog --- libcxl-1.7/debian/changelog 2018-05-17 16:31:53.000000000 +0200 +++ libcxl-1.7/debian/changelog 2021-04-27 13:25:03.000000000 +0200 @@ -1,3 +1,13 @@ +libcxl (1.7-2) unstable; urgency=medium + + [ Ondřej Nový ] + * d/rules: Remove trailing whitespaces + + [ Frédéric Bonnard ] + * Import upstream fix for make 4.3 use (Closes: #987636) + + -- Frédéric Bonnard <fre...@debian.org> Tue, 27 Apr 2021 13:25:03 +0200 + libcxl (1.7-1) unstable; urgency=medium * Remove unused d/patches effectively diff -Nru libcxl-1.7/debian/patches/0001-Import-upstream-fix-Closes-987636.patch libcxl-1.7/debian/patches/0001-Import-upstream-fix-Closes-987636.patch --- libcxl-1.7/debian/patches/0001-Import-upstream-fix-Closes-987636.patch 1970-01-01 01:00:00.000000000 +0100 +++ libcxl-1.7/debian/patches/0001-Import-upstream-fix-Closes-987636.patch 2021-04-27 13:25:03.000000000 +0200 @@ -0,0 +1,36 @@ +From: =?utf-8?b?RnLDqWTDqXJpYyBCb25uYXJk?= <fre...@debian.org> +Date: Tue, 27 Apr 2021 13:22:44 +0200 +Subject: Import upstream fix (Closes: #987636) + +https://github.com/ibm-capi/libcxl/commit/f10f957771a1ea7e6f52a48467bcf7ebf3cb1669 +--- + Makefile | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index b0626e8..8a07bac 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,12 +18,19 @@ all: check_cxl_header $(LIBSONAME) libcxl.so libcxl.a + HAS_WGET = $(shell /bin/which wget > /dev/null 2>&1 && echo y || echo n) + HAS_CURL = $(shell /bin/which curl > /dev/null 2>&1 && echo y || echo n) + +-# Update this to test a single feature from the most recent header we require: +-CHECK_CXL_HEADER_IS_UP_TO_DATE = $(shell /bin/echo -e \\\#include $(1)\\\nint i = CXL_START_WORK_TID\; | \ ++ ++# Update this to test a single feature from the most recent header we require. ++# ++# Note that a backward-incompatible change in make 4.3 modified the ++# handling \# in a function invocation, so we define the test code in ++# a separate variable to work around it and keep consistent behavior ++# across all versions of make ++TEST_CODE = '\#include <misc/cxl.h>\nint i = CXL_START_WORK_TID;' ++CHECK_OCXL_HEADER_IS_UP_TO_DATE = $(shell /bin/echo -e $(TEST_CODE) | \ + $(CC) $(CFLAGS) -Werror -x c -S -o /dev/null - >/dev/null 2>&1 && echo y || echo n) + + check_cxl_header: +-ifeq ($(call CHECK_CXL_HEADER_IS_UP_TO_DATE,"<misc/cxl.h>"),n) ++ifeq (${CHECK_CXL_HEADER_IS_UP_TO_DATE},n) + mkdir -p include/misc + ifeq (${HAS_WGET},y) + $(call Q,WGET include/misc/cxl.h, wget -O include/misc/cxl.h -q http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/include/uapi/misc/cxl.h) diff -Nru libcxl-1.7/debian/patches/series libcxl-1.7/debian/patches/series --- libcxl-1.7/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libcxl-1.7/debian/patches/series 2021-04-27 13:25:03.000000000 +0200 @@ -0,0 +1 @@ +0001-Import-upstream-fix-Closes-987636.patch diff -Nru libcxl-1.7/debian/rules libcxl-1.7/debian/rules --- libcxl-1.7/debian/rules 2018-05-16 18:35:20.000000000 +0200 +++ libcxl-1.7/debian/rules 2021-04-27 13:25:03.000000000 +0200 @@ -5,7 +5,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ + dh $@ override_dh_makeshlibs: dh_makeshlibs -- -c4
signature.asc
Description: PGP signature
