diff options
| author | James McCoy <jamessan@debian.org> | 2022-06-05 19:44:30 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2022-06-05 20:54:40 -0400 |
| commit | 61d396d408d423b504c732218164713aadb0be92 (patch) | |
| tree | fdedd03f120c53274c1a853c3b0277e7ac2771b0 | |
| parent | cc181155e36385c3af550fe1495827eb65cd6fb9 (diff) | |
Disable kwallet support on kfreebsd-*
Signed-off-by: James McCoy <jamessan@debian.org>
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/debian/control b/debian/control index ea3a00e..36e5b62 100644 --- a/debian/control +++ b/debian/control @@ -16,9 +16,9 @@ Build-Depends: autoconf, libdb5.3-dev, libdbus-1-dev, liblz4-dev (>= 0.0~r129), - libkf5coreaddons-dev <!pkg.subversion.nokde>, - libkf5i18n-dev <!pkg.subversion.nokde>, - libkf5wallet-dev <!pkg.subversion.nokde>, + libkf5coreaddons-dev [!kfreebsd-i386 !kfreebsd-amd64] <!pkg.subversion.nokde>, + libkf5i18n-dev [!kfreebsd-i386 !kfreebsd-amd64] <!pkg.subversion.nokde>, + libkf5wallet-dev [!kfreebsd-i386 !kfreebsd-amd64] <!pkg.subversion.nokde>, libperl-dev, libsasl2-dev, libsecret-1-dev, diff --git a/debian/rules b/debian/rules index 1bf2e76..5b14415 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,7 @@ ENABLE_JAVAHL = yes ENABLE_APACHE = yes ENABLE_RUBY = yes ENABLE_PYTHON = yes +ENABLE_KWALLET = yes DEB_BUILDDIR = $(CURDIR)/BUILD AUTH_LIB_DIRS = $(DEB_BUILDDIR)/subversion/libsvn_auth_gnome_keyring/.libs:$(DEB_BUILDDIR)/subversion/libsvn_auth_kwallet/.libs @@ -56,10 +57,19 @@ ifeq (,$(filter ruby-svn,$(shell dh_listpackages))) ENABLE_RUBY = endif +DISABLE_KWALLET_ARCHS = kfreebsd-i386 kfreebsd-amd64 +ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_KWALLET_ARCHS))) + ENABLE_KWALLET = +endif + +ifneq (,$(filter pkg.subversion.nokde,$(DEB_BUILD_PROFILES))) + ENABLE_KWALLET = +endif + # ENABLE_FOO -> DEB_OPT_WITH_FOO=1 # DEB_BUILD_OPTIONS='foo bar' -> DEB_OPT_FOO=1, DEB_OPT_BAR=1 # DEB_BUILD_OPTIONS='no-foo' -> DEB_OPT_WITH_FOO="" -$(foreach o, JAVAHL APACHE RUBY PYTHON, $(if $(filter y yes 1,$(ENABLE_$o)), \ +$(foreach o, JAVAHL APACHE RUBY PYTHON KWALLET, $(if $(filter y yes 1,$(ENABLE_$o)), \ $(eval DEB_OPT_WITH_$o := 1),$(eval DEB_OPT_WITH_$o :=))) d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS" | tr 'a-z-,' 'A-Z_ ') $(foreach o, $(d_b_o), \ @@ -117,7 +127,7 @@ ifdef DEB_OPT_DEBUG confflags+= --enable-debug endif -ifeq ($(filter pkg.subversion.nokde,$(DEB_BUILD_PROFILES)),) +ifdef DEB_OPT_WITH_KWALLET confflags += --with-kwallet=/usr/include:$(libdir) endif |