| Message ID | 1438008410-1465-2-git-send-email-bas@bmail.ru |
|---|---|
| State | Accepted |
| Headers | show |
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)) >
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))
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(-)