On Sun, Sep 30, 2018 at 07:08:26PM +0100, Simon McVittie wrote: >... > I prefer this approach because it's relatively self-contained, and > doesn't require us to carry non-upstreamable patches to upstream code > or rely on a relatively obscure Debian-specific compiler option. > > The alternative would be to modify the build system so that > at least SDL_config.h (and possibly all the headers) are in > /usr/include/<triplet>/SDL2, arrange for the pkg-config metadata to > include -I/usr/include/<triplet>/SDL2 (and possibly /usr/include/SDL2) > in the Cflags, and arrange for sdl2-config to output the same CFLAGS as > <triplet>-pkg-config without itself having architecture-varying content, > most likely by using a `cc -print-multiarch` trick similar to the one > Hugh suggested. >...
Wouldn't the least invasive option be a combination of 1. my --includedir=\$${prefix}/include/$(DEB_HOST_MULTIARCH) suggestion plus 2. the sdl2-config patching from Hugh When doing 1. the build system will use the correct paths in the pkg-config and cmake files. The only remaining issue would be sdl2-config, and this would be covered by 2. This sounds better to me than adding some Debian-specific header. It would move all headers under the multiarch location, but 1.5 MB diskspace additional usage are a non-issue for someone compiling for more than one architecture. Anything I miss here? cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed