Skip to contentSkip to conversation

package/xterm: Avoid freetype2 path poisoning using imake

PATCH New Valentin Korenblit 4 participants 4 messages Mar 27, 2018 – Apr 11, 2018

lore
Share & tools
lore

Valentin Korenblit

author
#0 lore raw

PATCH 1/1 package/xterm: Avoid freetype2 path poisoning using imake

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 <[email protected]>
---
 package/xterm/xterm.mk | 3 +++
 1 file changed, 3 insertions(+)
package/xterm/xterm.mk +3 -0
index 645de92e22..ff2b77459e 100644
@@ -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 using imake
+XTERM_CONF_ENV = ac_cv_path_IMAKE=
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
 XTERM_DEPENDENCIES += xlib_libXft
 XTERM_CONF_OPTS += --enable-freetype \
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/1 package/xterm: Avoid freetype2 path poisoning using imake

Hi Valentin, All,

Le 27/03/2018 ? 09:44, Valentin Korenblit a ?crit?:

Quoted 24 lines

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 <[email protected]>
---
 package/xterm/xterm.mk | 3 +++
 1 file changed, 3 insertions(+)
package/xterm/xterm.mk +0 -0
index 645de92e22..ff2b77459e 100644

package/xterm/xterm.mk XTERM_CONF_OPTS = --enable-256-color \ · line 19

Quoted 6 lines
package/xterm/xterm.mk +3 -0
@@ -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 using imake
+XTERM_CONF_ENV = ac_cv_path_IMAKE=
+

If you look at other ac_cv_path_* override on other packages, the syntax should be:
XTERM_CONF_ENV = ac_cv_path_IMAKE=""

This can be fixed while commiting.

With that fixed:

Reviewed-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 4 lines
package/xterm/xterm.mk +0 -0
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
 XTERM_DEPENDENCIES += xlib_libXft
 XTERM_CONF_OPTS += --enable-freetype \
Applied
#2 lore raw

PATCH 1/1 package/xterm: Avoid freetype2 path poisoning using imake

In reply to Valentin Korenblit

Hello,

Quoted 14 lines · Valentin Korenblit

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

Quoted 4 lines
Signed-off-by Valentin Korenblit <[email protected]>
---
 package/xterm/xterm.mk | 3 +++
 1 file changed, 3 insertions(+)

Applied to master after adjusting to ac_cv_path_IMAKE="" as suggested by Romain.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 package/xterm: Avoid freetype2 path poisoning using imake

In reply to Valentin Korenblit
Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Valentin" == Valentin Korenblit <[email protected]> writes:

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

Quoted 1 line
Signed-off-by Valentin Korenblit <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard