xapp_xdm: fix build with pkgconf 1.5.3
PATCH 1/1 xapp_xdm: fix build with pkgconf 1.5.3
Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target.
xapp_xdm uses the appdefaultdir variable from xt.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location.
Until a better solution is found in pkgconf, pass the appdefaultdir to use explicitly instead of relying on xt.pc.
Fixes:
- http://autobuild.buildroot.org/results/08bcba7d7340f34dc66b5b2ab8fbcfbaee309e37
--- package/x11r7/xapp_xdm/xapp_xdm.mk | 1 + 1 file changed, 1 insertion(+)
package/x11r7/xapp_xdm/xapp_xdm.mk +1 -0
@@ -20,6 +20,7 @@ XAPP_XDM_DEPENDENCIES = \ xlib_libXt \ xorgproto XAPP_XDM_CONF_OPTS = \ + --with-appdefaultdir=/usr/share/X11/app-defaults \ --with-utmp-file=/var/adm/utmpx \ --with-wtmp-file=/var/adm/wtmpx
Signature · 1 line
2.14.1
PATCH 1/1 xapp_xdm: fix build with pkgconf 1.5.3
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in
STAGING_DIR(e.g. libdir, includedir), but not when it refers to something used for the target.
xapp_xdmuses the appdefaultdir variable from xt.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location.
Quoted 7 lines
Until a better solution is found in pkgconf, pass the appdefaultdir to use explicitly instead of relying on xt.pc.
Fixes:
- http://autobuild.buildroot.org/results/08bcba7d7340f34dc66b5b2ab8fbcfbaee309e37Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard