[...]
Hi,
xserver-xorg-dev makes the aforementioned affected packages fail to
cross build from source, because pkg-config does not consider[1] >/usr/lib/pkgconfig/ during cross compilation. In contrast, it always >considers /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig, so moving
xorg-server.pc there will make both native and cross builds happy.
The requested change is implemented in the attached patch for your >convenience.
How do you feel about applying this patch to help with cross-compilation and (re)bootstrapping?
Unconvinced. d/rules is already too messy as it is.
(Copying explicitly pochu since he's the most active uploader in the
last year)
Hi,
2016-09-03 13:10 Helmut Grohne:
[...]
Hi,
xserver-xorg-dev makes the aforementioned affected packages fail to
cross build from source, because pkg-config does not consider[1] /usr/lib/pkgconfig/ during cross compilation. In contrast, it always considers /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig, so moving xorg-server.pc there will make both native and cross builds happy.
The requested change is implemented in the attached patch for your convenience.
How do you feel about applying this patch to help with cross-compilation
and (re)bootstrapping?
If it helps, I can prepare a NMU for it.
On 10/02/2017 09:48 PM, Helmut Grohne wrote:
5. d/rules fails to define the architecture variables (e.g.Looks like a bug in https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git/commit/?id=29d0f5ae367f0efa80d48990843f2e30019cd233
DEB_HOST_ARCH_OS). Unless building with dpkg-buildpackage they are
undefined. So I sneak "include /usr/share/dpkg/architecture.mk" into
the patch.
which we should fix. I think I'd prefer bringing back the explicit
variable definitions to architecture.mk, but don't feel very strongly
either way.
On Sun, Oct 01, 2017 at 10:47:54PM +0200, Julien Cristau wrote:
How do you feel about applying this patch to help with cross-compilation >>> and (re)bootstrapping?Unconvinced. d/rules is already too messy as it is.
Indeed. The original patch makes d/rules worse. So I am attaching a new
patch to improve the situation:
1. Drop --libdir (to pick up the debhelper default).
2. Add --with-module-dir to avoid moving /usr/lib/xorg. Other packages
place their modules here, so we cannot move it without coordination.
Given that there can be only one /usr/bin/Xorg and that these
modules are loaded into that Xorg, I think it should default to
${libexecdir}/modules. I can try changing that upstream.
3. Add --with-serverconfig-path to avoid moving protocol.txt. It ends
up in xserver-common, which is Arch:all and thus cannot be
multiarchy. Again using ${libexecdir} would make more sense.
4. Move the installation of pkgconfig into d/rules as .install files
cannot contain variables. (Alternatively: use dh-exec)
5. d/rules fails to define the architecture variables (e.g.
DEB_HOST_ARCH_OS). Unless building with dpkg-buildpackage they are
undefined. So I sneak "include /usr/share/dpkg/architecture.mk" into
the patch.
Ignoring the last point (which is a bug imo), this is a net increase in
1 line. Potentially, points 2 and 3 could be upstreamed to further
reduce messiness.
I hope this works better for you.
Sysop: | Keyop |
---|---|
Location: | Huddersfield, West Yorkshire, UK |
Users: | 293 |
Nodes: | 16 (2 / 14) |
Uptime: | 213:05:39 |
Calls: | 6,619 |
Calls today: | 1 |
Files: | 12,168 |
Messages: | 5,317,425 |