Source: dxvk
Version: 1.7.3+ds1-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
dxvk fails to cross build from source, because debian/rules severely
mixes up the terms build and host. Please refer to man dpkg-architecture
for their definition. I'm attaching a patch to clean it up. It does not
make dxvk cross buildable yet. Another step is annotating the toolchain
with Multi-Arch headers. That's a separate bug, so please close this one
when fixing build vs host.
Helmut
diff --minimal -Nru dxvk-1.7.3+ds1/debian/changelog
dxvk-1.7.3+ds1/debian/changelog
--- dxvk-1.7.3+ds1/debian/changelog 2020-12-08 22:06:19.000000000 +0100
+++ dxvk-1.7.3+ds1/debian/changelog 2020-12-21 12:06:22.000000000 +0100
@@ -1,3 +1,10 @@
+dxvk (1.7.3+ds1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Improve cross building: fix build/host confusion. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 21 Dec 2020 12:06:22 +0100
+
dxvk (1.7.3+ds1-1) unstable; urgency=medium
* New upstream release.
diff --minimal -Nru dxvk-1.7.3+ds1/debian/rules dxvk-1.7.3+ds1/debian/rules
--- dxvk-1.7.3+ds1/debian/rules 2020-12-08 22:06:19.000000000 +0100
+++ dxvk-1.7.3+ds1/debian/rules 2020-12-21 12:06:21.000000000 +0100
@@ -6,18 +6,17 @@
# Select winebuild-development
export WINEBUILD := /usr/bin/winebuild-development
-# 32 or 64
-DEB_BUILD_ARCH_BITS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
+include /usr/share/dpkg/architecture.mk
# The name of the build-*.txt profile to choose
-BUILD_NAME = win$(DEB_BUILD_ARCH_BITS)
+BUILD_NAME = win$(DEB_HOST_ARCH_BITS)
# The directory in which we will build
BUILD_DIR = build-$(BUILD_NAME)
# DEST_DIR is what we install to /usr/lib/dxvk
DEST_DIR = dxvk
-INSTALL_DIR = $(CURDIR)/$(DEST_DIR)/wine$(DEB_BUILD_ARCH_BITS)-development
+INSTALL_DIR = $(CURDIR)/$(DEST_DIR)/wine$(DEB_HOST_ARCH_BITS)-development
# stackprotector not supported by Wine libs, see wine-development package
export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-stackprotector
@@ -43,15 +42,13 @@
CXXFLAGS_MESON := $(shell echo $(CXXFLAGS_MESON) | sed -r "s/ ?([^ ]+)/,
'\1'/g")
LDFLAGS_MESON := $(shell echo $(LDFLAGS_MESON) | sed -r "s/ ?([^ ]+)/, '\1'/g")
-DEB_BUILD_MULTIARCH=$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-
# Meson flags
MESON_FLAGS = --buildtype release \
--cross-file build-$(BUILD_NAME).txt.gen \
--prefix $(INSTALL_DIR) \
--bindir . \
--libdir . \
- -Dwine_libdir=/usr/lib/$(DEB_BUILD_MULTIARCH)/wine-development/
\
+ -Dwine_libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/wine-development/ \
$(BUILD_DIR)
override_dh_auto_configure:
