Skip to contentSkip to conversation

xterm: x-includes and x-libraries must be set for cross-compiling

PATCH New Mikhail Peselnik 3 participants 6 messages Jul 27, 2015 – Jul 28, 2015

lore
Share & tools
lore

Mikhail Peselnik

author
#0 lore raw

PATCH 1/2 xterm: x-includes and x-libraries must be set for cross-compiling

These flags need to be set so that the configure script would correctly use libICE from cross-toolchain rather than from host.

This fix is similar to "package/efl/libevas: x-includes and x-libraries must be set for cross-compiling" done by Romain Naour on libecore.

Signed-off-by Mikhail Peselnik <[email protected]>
---
 package/xterm/xterm.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/xterm/xterm.mk +3 -1
index 56f692d..778b40c 100644
@@ -10,6 +10,8 @@ XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw
 XTERM_LICENSE = MIT
 XTERM_LICENSE_FILES = version.c
-XTERM_CONF_OPTS = --enable-256-color
+XTERM_CONF_OPTS = --enable-256-color \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
 
 $(eval $(autotools-package))
Signature · 1 line
2.4.6
author
#1 lore raw

PATCH 2/2 package/xterm: compile with libXft support when it selected

When libXft (FreeType) library is selected, xterm will use it. host-pkgcong is used to search for libXft during configure, so it is in the dependencies.

Signed-off-by Mikhail Peselnik <[email protected]>
---
 package/xterm/xterm.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/xterm/xterm.mk +9 -1
index 778b40c..e7afff2 100644
@@ -7,11 +7,19 @@
 XTERM_VERSION = 314
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
 XTERM_SITE = ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = ncurses xlib_libXaw
+XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf
 XTERM_LICENSE = MIT
 XTERM_LICENSE_FILES = version.c
 XTERM_CONF_OPTS = --enable-256-color \
 	--x-includes=$(STAGING_DIR)/usr/include \
 	--x-libraries=$(STAGING_DIR)/usr/lib
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
+XTERM_DEPENDENCIES += xlib_libXft
+XTERM_CONF_OPTS += --enable-freetype \
+	--with-freetype-config=auto
+else
+XTERM_CONF_OPTS += --disable-freetype
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.4.6
#2 lore raw

PATCH 2/2 package/xterm: compile with libXft support when it selected

Hi Mikhail,

Le 27/07/2015 16:46, Mikhail Peselnik a ?crit :

Quoted 5 lines

When libXft (FreeType) library is selected, xterm will use it. host-pkgcong is used to search for libXft during configure, so it is in the dependencies.

Signed-off-by Mikhail Peselnik <[email protected]>

Thanks for your patches!

Reviewed-by Romain Naour <[email protected]>

[Build tested only and checked that the libXft library is detected by the configure script
"checking if we can link with FreeType libraries... yes"]

Tested-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 30 lines
---
 package/xterm/xterm.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/xterm/xterm.mk +9 -1
index 778b40c..e7afff2 100644
@@ -7,11 +7,19 @@
 XTERM_VERSION = 314
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
 XTERM_SITE = ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = ncurses xlib_libXaw
+XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf
 XTERM_LICENSE = MIT
 XTERM_LICENSE_FILES = version.c
 XTERM_CONF_OPTS = --enable-256-color \
 	--x-includes=$(STAGING_DIR)/usr/include \
 	--x-libraries=$(STAGING_DIR)/usr/lib
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
+XTERM_DEPENDENCIES += xlib_libXft
+XTERM_CONF_OPTS += --enable-freetype \
+	--with-freetype-config=auto
+else
+XTERM_CONF_OPTS += --disable-freetype
+endif
+
 $(eval $(autotools-package))
#3 lore raw

PATCH 1/2 xterm: x-includes and x-libraries must be set for cross-compiling

In reply to Mikhail Peselnik

Hi Mikhail,

Le 27/07/2015 16:46, Mikhail Peselnik a ?crit :

Quoted 7 lines

These flags need to be set so that the configure script would correctly use libICE from cross-toolchain rather than from host.

This fix is similar to "package/efl/libevas: x-includes and x-libraries must be set for cross-compiling" done by Romain Naour on libecore.

Signed-off-by Mikhail Peselnik <[email protected]>
Reviewed-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 19 lines
---
 package/xterm/xterm.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/xterm/xterm.mk +3 -1
index 56f692d..778b40c 100644
@@ -10,6 +10,8 @@ XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw
 XTERM_LICENSE = MIT
 XTERM_LICENSE_FILES = version.c
-XTERM_CONF_OPTS = --enable-256-color
+XTERM_CONF_OPTS = --enable-256-color \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
 
 $(eval $(autotools-package))
#4 lore raw

PATCH 1/2 xterm: x-includes and x-libraries must be set for cross-compiling

In reply to Mikhail Peselnik

Dear Mikhail Peselnik,

Quoted 10 lines · Mikhail Peselnik

These flags need to be set so that the configure script would correctly use libICE from cross-toolchain rather than from host.

This fix is similar to "package/efl/libevas: x-includes and x-libraries must be set for cross-compiling" done by Romain Naour on libecore.

Signed-off-by Mikhail Peselnik <[email protected]>
---
 package/xterm/xterm.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Both patches applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH 1/2 xterm: x-includes and x-libraries must be set for cross-compiling

Hi Thomas, Romain

Quoted 3 lines · Thomas Petazzoni

Both patches applied, thanks!

Thank you both for having a deeper look into the problem and helping me out!