Hi Simon, On Fri, Dec 06, 2019 at 09:19:30AM +0000, Simon McVittie wrote: > On Thu, 05 Dec 2019 at 15:18:40 -0800, Steve Langasek wrote: > > This requires changes to some tests so that they are cross-aware and can do > > the right thing.
> Thanks for this patch. I'm assuming this is going to be the first of many > build smoke-tests that will need similar changes when the autopkgtest > change lands, so I'm being extra-careful when reviewing it, to try to > get the clearest possible patches for other packages. Indeed, there are a number of others in flight, so thanks for the feedback. > > +if [ -n "$DEB_HOST_MULTIARCH" ]; then > > + export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig" > > + PREFIX="$DEB_HOST_GNU_TYPE-" > > +fi > > +${PREFIX}gcc -Wall -Werror -o atk1.0-dev_test atk1.0-dev_test.c > > `pkg-config --cflags --libs atk` > I think it would be both more concise and more realistic to use > ${PREFIX}pkg-config instead of setting PKG_CONFIG_PATH, and rely on the > multiarch symlink to /usr/share/pkg-config-crosswrapper for the mechanics > of finding the right library? That matches what will actually happen when > cross-compiling with dpkg, if I understand correctly (and it's actually > PKG_CONFIG_LIBDIR that gets set in the cross-wrapper). As far as I see, installing crossbuild-essential-i386 + pkg-config doesn't set up an i386-linux-gnu-pkg-config symlink. Do you think autopkgtests should be setting up such a symlink locally, rather than just manually setting the path, provided that the latter works? > Perhaps it would be clearer to name the variable CROSS_COMPILE instead of > PREFIX, to avoid it being mixed up with other concepts also named prefix, > like the one that is normally /usr? `make CROSS_COMPILE=i686-linux-gnu-` > and `CC=${CROSS_COMPILE}gcc` is the convention used for the equivalent > variable in for example Linux, Busybox and OpenSSL, so it should be > reasonably familiar. That seems reasonable to me. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
signature.asc
Description: PGP signature