From: Hans van Kranenburg <hans@knorrie.org>
Date: Sat, 21 Nov 2020 21:52:20 +0000 (+0100)
Subject: Partially revert "debian/rules: Combine shared Make args"
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7272245371e7b04290482f09474800ccdd987d9c;p=xen.git

Partially revert "debian/rules: Combine shared Make args"

This reverts part of commit af30268ed73397d24acaee83477ff555a43df5e4.

The change caused the following FTBFS on i386:

    gcc    -Wl,-z,relro -Wl,-z,now -pthread -Wl,-soname
    -Wl,libxentoolcore.so.1 -shared -Wl,--version-script=libxentoolcore.map
    -o libxentoolcore.so.1.0 handlereg.opic
    /usr/bin/ld: i386:x86-64 architecture of input file `handlereg.opic' is
    incompatible with i386 output
    /usr/bin/ld: handlereg.opic: file class ELFCLASS64 incompatible with
    ELFCLASS32
    /usr/bin/ld: final link failed: file in wrong format
    collect2: error: ld returned 1 exit status

"For $(make_args_xen), ${XEN_TARGET_ARCH} gets $(xen_arch_$(flavour)),
but for $(make_args_tools), ${XEN_TARGET_ARCH} gets
$(xen_arch_$(DEB_HOST_ARCH))."
---

diff --git a/debian/rules b/debian/rules
index 81a0896a76..4032dc9c15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,14 +135,15 @@ dpkg_CPPFLAGS := $(shell $(dbmo) dpkg-buildflags --get CPPFLAGS)
 dpkg_LDFLAGS  := $(shell $(dbmo) dpkg-buildflags --get LDFLAGS)
 
 make_args_common := \
-	XEN_COMPILE_ARCH=$(xen_arch_$(DEB_BUILD_ARCH)) \
-	XEN_TARGET_ARCH=$(xen_arch_$(flavour))
+	XEN_COMPILE_ARCH=$(xen_arch_$(DEB_BUILD_ARCH))
 
-make_args_xen := $(make_args_common)
+make_args_xen := $(make_args_common) \
+	XEN_TARGET_ARCH=$(xen_arch_$(flavour))
 # (Xen upstream does not offer a separate CPPFLAGS,
 # so we pass those in CFLAGS.)
 
 make_args_tools := $(make_args_common) \
+	XEN_TARGET_ARCH=$(xen_arch_$(DEB_HOST_ARCH)) \
 	EXTRA_CFLAGS_XEN_TOOLS='$(dpkg_CFLAGS) $(dpkg_CPPFLAGS)' \
 	PREPEND_LDFLAGS_XEN_TOOLS='$(dpkg_LDFLAGS)'