Bug#596586: unusable on D-I environment (kfreebsd)
Package: xserver-xorg-core-udeb
Version: 1.7.7-5
Severity: important
Tags: d-i patch
On GNU/kFreeBSD, xserver-xorg-core is built with HAL support, which
requires libhal and (indirectly) libdbus, but neither are available
on D-I environment.
I don't know which functionality of X depends on this, but it's
certainly non-essential, as I've verified. This patch adjusts the
configure flags so that HAL support is enabled in main build but
not in udeb build.
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 8.1-1-amd64
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nur xorg-server-1.7.7.old/debian/rules xorg-server-1.7.7/debian/rules
--- xorg-server-1.7.7.old/debian/rules 2010-09-12 20:32:01.000000000 +0200
+++ xorg-server-1.7.7/debian/rules 2010-09-12 19:31:10.272801710 +0200
@@ -63,7 +63,9 @@
ifeq ($(DEB_HOST_ARCH_OS), linux)
config_backend += --enable-config-udev --disable-config-hal
else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- config_backend += --disable-config-udev --enable-config-hal
+ config_backend += --disable-config-udev
+ config_backend_main += --enable-config-hal
+ config_backend_udeb += --disable-config-hal
else # hurd
config_backend += --disable-config-udev --disable-config-hal
endif
@@ -141,6 +143,7 @@
--enable-xephyr \
$(build_xfbdev) \
--with-sha1=libgcrypt \
+ $(config_backend_main) \
$(void)
confflags_udeb = \
@@ -171,6 +174,7 @@
--disable-xephyr \
--disable-xfbdev \
--with-sha1=libnettle \
+ $(config_backend_udeb) \
$(void)
$(STAMP_DIR)/autoreconf: $(STAMP_DIR)/patch
Reply to: