diff options
| author | David Bremner <david@tethera.net> | 2023-09-18 06:16:47 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2023-09-18 06:16:47 -0300 |
| commit | 1129cf890ef812321ac8296a4ca964a796df0b87 (patch) | |
| tree | ffe0b3a98a7210c292d94d3ae6c9ebbed70fd4a5 /debian/rules | |
| parent | 12aa05f07cb8aae736895c46fb25e0106daf207c (diff) | |
| parent | d4e0aaa76bd9e7a9e36abf47dc9ad3ea8bc10334 (diff) | |
Merge remote-tracking branch 'origin/master' into nmwebnmweb
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index f9196b82..a77ffa15 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,9 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk + +ifeq ($(DEB_HOST_ARCH),ppc64el) + export NOTMUCH_SKIP_TESTS = T810-tsan +endif export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -7,7 +12,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_configure: BASHCMD=/bin/bash ./configure --prefix=/usr \ - --libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \ + --libdir=/usr/lib/${DEB_TARGET_MULTIARCH} \ --includedir=/usr/include \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ @@ -24,7 +29,6 @@ override_dh_auto_build: override_dh_auto_clean: dh_auto_clean PYBUILD_NAME=notmuch dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python - PYBUILD_NAME=notmuch2 dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python-cffi dh_auto_clean --sourcedirectory bindings/ruby $(MAKE) -C contrib/notmuch-mutt clean |