diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:21:32 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:21:32 +0000 |
commit | f6202465947cc7b307729aa1dec7f81fa41c7ea6 (patch) | |
tree | a6a6132df95f51c8480c59b75da314bcebece0a8 /debian/rules | |
parent | Releasing progress-linux version 1:9.7p1-1~progress7.99u1. (diff) | |
download | openssh-f6202465947cc7b307729aa1dec7f81fa41c7ea6.tar.xz openssh-f6202465947cc7b307729aa1dec7f81fa41c7ea6.zip |
Merging debian version 1:9.7p1-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules index 6184bef..f3fa87f 100755 --- a/debian/rules +++ b/debian/rules @@ -108,6 +108,10 @@ ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) BUILD_PACKAGES += -Nopenssh-tests endif +ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) + BUILD_PACKAGES += -Nssh-askpass-gnome +endif + %: dh $@ --with=runit $(BUILD_PACKAGES) @@ -132,9 +136,11 @@ ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen endif +ifneq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),) $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) endif +endif override_dh_auto_build-indep: |