]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/xterm: Avoid freetype2 path poisoning using imake
authorValentin Korenblit <valentin.korenblit@smile.fr>
Tue, 27 Mar 2018 07:44:34 +0000 (09:44 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 31 Mar 2018 20:56:46 +0000 (22:56 +0200)
When imake is installed on the host, it tries to include
freetype headers from host, so we must override ac_cv_path_IMAKE
to avoid this.

Extract from config.log:

configure:14803: checking if we should use imake to help
configure:14820: result: yes
configure:14829: checking for xmkmf
configure:14846: found /usr/bin/xmkmf
configure:14857: result: /usr/bin/xmkmf
configure:14920: testing Using /usr/bin/xmkmf  ...
configure:15015: testing IMAKE_CFLAGS  -I. -I/usr/include/freetype2

Signed-off-by: Valentin Korenblit <valentin.korenblit@smile.fr>
[Thomas: pass ac_cv_path_IMAKE="" as suggested by Romain Naour.]
Reviewed-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/xterm/xterm.mk

index 645de92e220f7f47cf2b7ea754c8d0c41ee57a5a..201280fd46288db3b505125f530f485a290477b4 100644 (file)
@@ -14,6 +14,9 @@ XTERM_CONF_OPTS = --enable-256-color \
        --x-includes=$(STAGING_DIR)/usr/include \
        --x-libraries=$(STAGING_DIR)/usr/lib
 
+# Avoid freetype2 path poisoning by imake
+XTERM_CONF_ENV = ac_cv_path_IMAKE=""
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
 XTERM_DEPENDENCIES += xlib_libXft
 XTERM_CONF_OPTS += --enable-freetype \