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

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

[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 <bas@bmail.ru>
---
 package/xterm/xterm.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index 56f692d..778b40c 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -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))
-- 
2.4.6

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

[Mikhail Peselnik]

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 <bas@bmail.ru>
---
 package/xterm/xterm.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index 778b40c..e7afff2 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -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))
-- 
2.4.6

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

[Romain Naour]

Hi Mikhail,

Le 27/07/2015 16:46, Mikhail Peselnik a ?crit :
> 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 <bas@bmail.ru>

Thanks for your patches!

Reviewed-by: Romain Naour <romain.naour@openwide.fr>

[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 <romain.naour@openwide.fr>

Best regards,
Romain

> ---
>  package/xterm/xterm.mk | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
> index 778b40c..e7afff2 100644
> --- a/package/xterm/xterm.mk
> +++ b/package/xterm/xterm.mk
> @@ -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))
> 

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

[Romain Naour]

Hi Mikhail,

Le 27/07/2015 16:46, Mikhail Peselnik a ?crit :
> 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 <bas@bmail.ru>

Reviewed-by: Romain Naour <romain.naour@openwide.fr>

Best regards,
Romain

> ---
>  package/xterm/xterm.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
> index 56f692d..778b40c 100644
> --- a/package/xterm/xterm.mk
> +++ b/package/xterm/xterm.mk
> @@ -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))
> 

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

[Thomas Petazzoni]

Dear Mikhail Peselnik,

On Mon, 27 Jul 2015 17:46:49 +0300, Mikhail Peselnik wrote:
> 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 <bas@bmail.ru>
> ---
>  package/xterm/xterm.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Both patches applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

[kyak]

Hi Thomas, Romain

On Mon, 27 Jul 2015, Thomas Petazzoni wrote:

>
> Both patches applied, thanks!
>

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