CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tk: Fix build with xft

Browse Source 
* xft requires fontconfig, but pkg-config --libs xft doesn't return it
  add it manually

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2014-05-10 16:50:36 +02:00
parent c004507291
commit b4cfe86deb
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta-oe/recipes-devtools/tcltk/tk-8.6.0/configure.use.fontconfig.with.xft.patch Normal file
View File

@ -0,0 +1,13 @@
--- a/configure.in.orig 2014-05-10 14:35:39.859147385 +0000
+++ b/configure.in 2014-05-10 14:36:20.282925184 +0000
@@ -554,8 +554,8 @@
dnl make sure package configurator (xft-config or pkg-config
dnl says that xft is present.
found_xft=yes
- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
AC_MSG_RESULT([$found_xft])
dnl make sure that compiling against Xft header file doesn't bomb
if test "$found_xft" = "yes" ; then

3
meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
View File

@ -15,8 +15,6 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=c88f99decec11afa967ad33d314f87fe
file://../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
"
PNBLACKLIST[tk] = "tk8.6.0/unix/libtk8.6.so: error: undefined reference to 'FcCharSetHasChar'"
DEPENDS = "tcl virtual/libx11 libxt"
SRC_URI = "\
@ -26,6 +24,7 @@ SRC_URI = "\
file://tklibrary.diff;striplevel=2 \
file://tkprivate.diff;striplevel=2 \
file://fix-xft.diff \
file://configure.use.fontconfig.with.xft.patch \
"
SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8"
SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6"