[Git][debian-proftpd-team/proftpd][master] --disable-xattr only on kfreebsd

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
9951d381 by Hilmar Preusse at 2018-05-02T15:10:40+02:00
--disable-xattr only on kfreebsd

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 proftpd-dfsg (1.3.6-3) UNRELEASED; urgency=medium
 
   [ Hilmar Preuße ]
-  * Run configure w/ --disable-xattr to fix FTBFS on kfreebsd.
+  * Run configure w/ --disable-xattr only on kfreebsd to fix FTBFS.
     (Closes: #897168)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 01 May 2018 14:57:41 +0200


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,13 @@ ifeq (,$(DEB_BUILD_GNU_TYPE))
   include debian/scripts/dpkg-arch.mk
 endif
 
+# XAttr does not exist on KFreeBSD
+# 
+XATTR_NOT_EXISTS := kfreebsd-amd64 kfreebsd-i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(XATTR_NOT_EXISTS)))
+  BUILDNOTXATTR=--disable-xattr
+endif
+
 include /usr/share/dpkg/buildflags.mk
 
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq
@@ -44,7 +51,7 @@ CONF_ARGS := --prefix=/usr \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls \
 	     --enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT) \
-	     --disable-strip --enable-redis --disable-xattr
+	     --disable-strip --enable-redis $(BUILDNOTXATTR)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONF_ARGS += --build $(DEB_HOST_GNU_TYPE)



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/9951d381d16c46abe39575f2ea4c1d46fe794975

---
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/9951d381d16c46abe39575f2ea4c1d46fe794975
You're receiving this email because of your account on salsa.debian.org.