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
3 changed files:
Changes:
| ... | ... | @@ -2,6 +2,7 @@ xorg-server (2:1.20.1-3) UNRELEASED; urgency=medium |
| 2 | 2 |
|
| 3 | 3 |
* xvfb-run*: Update default resolution and bitdepth to match upstream
|
| 4 | 4 |
defaults.
|
| 5 |
+ * Limit libunwind to archs that actually have it. (Closes: #909240)
|
|
| 5 | 6 |
|
| 6 | 7 |
-- Timo Aaltonen <tjaalton@debian.org> Thu, 20 Sep 2018 00:21:47 +0300
|
| 7 | 8 |
|
| ... | ... | @@ -29,7 +29,7 @@ Build-Depends: |
| 29 | 29 |
libaudit-dev [linux-any],
|
| 30 | 30 |
libdrm-dev (>= 2.4.89) [!hurd-i386],
|
| 31 | 31 |
libgl1-mesa-dev (>= 9.2),
|
| 32 |
- libunwind-dev,
|
|
| 32 |
+ libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4],
|
|
| 33 | 33 |
libxmuu-dev (>= 1:0.99.1),
|
| 34 | 34 |
libxext-dev (>= 1:0.99.1),
|
| 35 | 35 |
libx11-dev (>= 2:1.6),
|
| ... | ... | @@ -41,7 +41,6 @@ confflags += \ |
| 41 | 41 |
confflags_main = \
|
| 42 | 42 |
--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" \
|
| 43 | 43 |
--enable-composite \
|
| 44 |
- --enable-libunwind \
|
|
| 45 | 44 |
--enable-record \
|
| 46 | 45 |
--enable-xv \
|
| 47 | 46 |
--enable-xvmc \
|
| ... | ... | @@ -133,6 +132,11 @@ else # hurd |
| 133 | 132 |
confflags += --disable-config-udev
|
| 134 | 133 |
endif
|
| 135 | 134 |
|
| 135 |
+# some archs don't have libunwind
|
|
| 136 |
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4))
|
|
| 137 |
+ confflags_main += --enable-libunwind
|
|
| 138 |
+endif
|
|
| 139 |
+ |
|
| 136 | 140 |
# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
|
| 137 | 141 |
# even in udeb
|
| 138 | 142 |
# kfreebsd: libdrm for dri in main build
|