diff options
| author | midipix <writeonce@midipix.org> | 2019-08-20 12:47:31 -0400 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-08-21 08:20:53 +0000 |
| commit | e6a2bc1531bcf3969fedd54b8ae10e498fa22fbf (patch) | |
| tree | 9e629eeb2031e6c234f6bcab556373c2fb942b5c | |
| parent | 5e3bc831afddf98e154fa53f1af289e3223b3f1f (diff) | |
| download | midipix_build-e6a2bc1531bcf3969fedd54b8ae10e498fa22fbf.tar.bz2 midipix_build-e6a2bc1531bcf3969fedd54b8ae10e498fa22fbf.tar.xz | |
tk: fix xft diagnostics when cross-compiling.
Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
| -rw-r--r-- | patches/tk-8.7a1.local.patch | 29 | ||||
| -rw-r--r-- | vars/build.vars | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/patches/tk-8.7a1.local.patch b/patches/tk-8.7a1.local.patch new file mode 100644 index 00000000..30bc5ca0 --- /dev/null +++ b/patches/tk-8.7a1.local.patch @@ -0,0 +1,29 @@ +diff -ru a/unix/configure b/unix/configure +--- a/unix/configure 2017-09-06 07:52:06.000000000 -0400 ++++ b/unix/configure 2019-08-20 12:46:31.097935159 -0400 +@@ -8054,13 +8054,21 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xft" >&5 + $as_echo "$enable_xft" >&6; } + else ++ if [ $cross_compiling = yes ]; then ++ XFT_CONFIG=${host}-xft-config ++ PKG_CONFIG=${host}-pkg-config ++ else ++ XFT_CONFIG=xft-config ++ PKG_CONFIG=pkg-config ++ fi ++ + found_xft="yes" +- XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no" +- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" ++ XFT_CFLAGS=`"${XFT_CONFIG}" --cflags 2>/dev/null` || found_xft="no" ++ XFT_LIBS=`"${XFT_CONFIG}" --libs 2>/dev/null` || found_xft="no" + if test "$found_xft" = "no" ; then + 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 2>/dev/null` || found_xft="no" ++ XFT_LIBS=`"${PKG_CONFIG}" --libs xft 2>/dev/null` || found_xft="no" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5 + $as_echo "$found_xft" >&6; } diff --git a/vars/build.vars b/vars/build.vars index 90b2c3d9..5cda5cd4 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1431,6 +1431,9 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils : ${PKG_TK_URL:=http://kuiper.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/tcl8_7/tk${PKG_TK_VERSION}-src.tar.gz}; : ${PKG_TK_CONFIGURE:="tk${PKG_TK_VERSION}/unix/configure"}; : ${PKG_TK_CONFIGURE_ARGS_EXTRA:="tcl_cv_strtod_buggy=no --with-tcl=${PREFIX_NATIVE}/lib"}; +: ${PKG_TK_PATCHES_EXTRA:="${PWD}patches/tk-8.7a1.local.patch"}; +: ${PKG_TK_SUBDIR:=tk${PKG_TK_VERSION}}; + # # Packages list native_packages_etc |