[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: lxqt-config: FTBFS on hurd-i386: udev not available



Hi!

Am Montag, den 29.07.2019, 18:37 +0200 schrieb Guillem Jover:
> [...]
> 
> The usual convention is to use the same name as the queried variable,
> so «DEB_HOST_ARCH_OS = ...», but I think even better would be to just
> do «include /usr/share/dpkg/architecture.mk» and then just use the
> needed variables lazily defined there.
> 
> [...] I tend to use something like:
> 
>   confflags += -DWITH_TOUCHPAD=NO
> 
> so that it can be extended, w/o rendering the name invalid.

Updated patch according to Guillem's proposals.

> [...]

Thanks
diff --git a/debian/rules b/debian/rules
index 4f7c70d..4f5c019 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,16 @@ export LC_ALL=C.UTF-8
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+include /usr/share/dpkg/architecture.mk
+
+CONF_FLAGS := \
+	-DUPDATE_TRANSLATIONS=OFF \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+ifneq  ($(DEB_HOST_ARCH_OS), linux)
+    CONF_FLAGS += -DWITH_TOUCHPAD=NO
+endif
+
 %:
 	dh ${@} --buildsystem cmake
 
@@ -13,8 +23,7 @@ override_dh_missing:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DUPDATE_TRANSLATIONS=OFF \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+		$(CONF_FLAGS)
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xlxqt-config

Reply to: