Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver /
xorg-server
Commits:
166ad97f by Timo Aaltonen at 2018-09-20T08:12:53Z
Limit libunwind to archs that actually have it. (Closes: #909240)
- - - - -
3 changed files:
- debian/changelog
- debian/control
- debian/rules.flags
Changes:
=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ xorg-server (2:1.20.1-3) UNRELEASED; urgency=medium
* xvfb-run*: Update default resolution and bitdepth to match upstream
defaults.
+ * Limit libunwind to archs that actually have it. (Closes: #909240)
-- Timo Aaltonen <[email protected]> Thu, 20 Sep 2018 00:21:47 +0300
=====================================
debian/control
=====================================
@@ -29,7 +29,7 @@ Build-Depends:
libaudit-dev [linux-any],
libdrm-dev (>= 2.4.89) [!hurd-i386],
libgl1-mesa-dev (>= 9.2),
- libunwind-dev,
+ libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el
mipsel powerpc powerpcspe ppc64 ppc64el sh4],
libxmuu-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
libx11-dev (>= 2:1.6),
=====================================
debian/rules.flags
=====================================
@@ -41,7 +41,6 @@ confflags += \
confflags_main = \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins"
\
--enable-composite \
- --enable-libunwind \
--enable-record \
--enable-xv \
--enable-xvmc \
@@ -133,6 +132,11 @@ else # hurd
confflags += --disable-config-udev
endif
+# some archs don't have libunwind
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf hppa i386 ia64 mips
mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4))
+ confflags_main += --enable-libunwind
+endif
+
# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
# even in udeb
# kfreebsd: libdrm for dri in main build
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/commit/166ad97f54b61289e657320838c8d7ff3d6c6581
--
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/commit/166ad97f54b61289e657320838c8d7ff3d6c6581
You're receiving this email because of your account on salsa.debian.org.
