Package: procps
Version: 2:4.0.2-3
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lunar ubuntu-patch
X-Debbugs-Cc: sl...@ubuntu.com
Dear Maintainer,
In Ubuntu, we are carrying some delta to improve the cross-building ability
of procps, by passing --build and --host arguments to the ./configure script
in addition to using cross pkg-config. This might be useful for Debian as well.
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'),
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.15.0-56-generic (SMP w/8 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru procps-4.0.2/debian/rules procps-4.0.2/debian/rules
--- procps-4.0.2/debian/rules 2022-12-19 07:06:38.000000000 +0100
+++ procps-4.0.2/debian/rules 2023-02-15 12:39:13.000000000 +0100
@@ -7,11 +7,17 @@
DEBROOT=$(CURDIR)/debian/tmp
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
configure_flags += --host=$(DEB_HOST_GNU_TYPE)
+CROSS = PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config \
+ ac_cv_func_malloc_0_nonnull=yes \
+ ac_cv_func_realloc_0_nonnull=yes
+else
+CROSS=
endif
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -24,7 +30,7 @@
dh $@
override_dh_auto_configure:
- ./configure \
+ $(CROSS) ./configure \
$(configure_flags) \
--build=$(DEB_BUILD_GNU_TYPE) \
--disable-silent-rules \
@@ -34,7 +40,9 @@
--disable-modern-top \
--prefix=/usr \
--exec-prefix=/ \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
override_dh_auto_install: $(autogen-files)
