Bug#977577: libowfat: Disable dietlibc build on riscv64
Package: libowfat
Version: 0.30-3
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Dear Maintainer,
libowfat currently doesn't build on riscv64 because dietlibc is not
available for that architecture.
In Ubuntu, the attached patch was applied to achieve the following:
* Adapt xnox's patch from 0.30-2ubuntu1, this time to only disable the
dietlibc build on riscv64.
You'll probably need to adapt the patch to reflect all of the
architectures supported in Debian.
Thanks for considering the patch.
Logan
-- System Information:
Debian Release: bullseye/sid
APT prefers groovy-updates
APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500, 'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.128-microsoft-standard (SMP w/8 CPU threads)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru libowfat-0.30/debian/control libowfat-0.30/debian/control
--- libowfat-0.30/debian/control 2020-04-30 16:42:48.000000000 -0400
+++ libowfat-0.30/debian/control 2020-12-16 00:01:12.000000000 -0500
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Standards-Version: 4.5.0
-Build-Depends: dietlibc-dev, dietlibc-dev (>= 0.32-5) [sparc], debhelper-compat (= 13)
+Build-Depends: dietlibc-dev [amd64 arm64 armhf ppc64el s390x], debhelper-compat (= 13)
Homepage: http://www.fefe.de/libowfat/
Vcs-Git: https://salsa.debian.org/debian/libowfat.git
Vcs-Browser: https://salsa.debian.org/debian/libowfat
@@ -43,7 +43,7 @@
Package: libowfat-dietlibc-dev
Section: libdevel
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el s390x
Depends: dietlibc-dev, ${misc:Depends}
Conflicts: libdjbdns1-dev
Breaks: libowfat-dev (<< 0.28-3)
diff -Nru libowfat-0.30/debian/rules libowfat-0.30/debian/rules
--- libowfat-0.30/debian/rules 2020-04-30 14:41:56.000000000 -0400
+++ libowfat-0.30/debian/rules 2020-12-16 00:01:12.000000000 -0500
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@@ -15,11 +17,14 @@
$(MAKE) -f $(CURDIR)/GNUmakefile -C build-glibc SRC=$(CURDIR)/ DIET=''
rm build-glibc/entities.h
+# dietlibc is unavailable on riscv64
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf ppc64el s390x))
mkdir build-diet
$(MAKE) -f $(CURDIR)/GNUmakefile -C build-diet SRC=$(CURDIR)/ DIET='diet -v -Os'
rm build-diet/entities.h
touch build-stamp
+endif
override_dh_clean:
dh_clean # doesn't remove directories
Reply to: