Skip to contentSkip to conversation

xapp_xedit: fix build with pkgconf 1.5.3

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 14, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xapp_xedit: 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_xedit 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/1b46f950fc0d957d04c0a60a24176d701ff16bd9

---
 package/x11r7/xapp_xedit/xapp_xedit.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/x11r7/xapp_xedit/xapp_xedit.mk +3 -1
index 0f42e2cb0d..1cb99dc6f4 100644
@@ -11,6 +11,8 @@ XAPP_XEDIT_LICENSE = MIT
 XAPP_XEDIT_LICENSE_FILES = COPYING
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw
 
-XAPP_XEDIT_CONF_OPTS = --disable-selective-werror
+XAPP_XEDIT_CONF_OPTS = \
+	--disable-selective-werror \
+	--with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 xapp_xedit: 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_xedit 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.

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/1b46f950fc0d957d04c0a60a24176d701ff16bd9

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard