diff options
| author | Ørjan Malde <red@foxi.me> | 2023-03-30 14:28:18 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2023-03-30 14:31:39 +0200 |
| commit | 2665b3a9b7289516298d3cb1bdf0d33686ccb446 (patch) | |
| tree | 4f7d3a62ba4cc8af6e6ce19692ec585b05422c68 | |
| parent | ea25315a373d8628f3094f2e89e44f8fb6dde999 (diff) | |
| download | midipix_build-2665b3a9b7289516298d3cb1bdf0d33686ccb446.tar.bz2 midipix_build-2665b3a9b7289516298d3cb1bdf0d33686ccb446.tar.xz | |
patches/tk-8.7a1.local.patch: don't use build machine's X11 headers
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | patches/tk-8.7a1.local.patch | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/patches/tk-8.7a1.local.patch b/patches/tk-8.7a1.local.patch index 30bc5ca0..86b930e0 100644 --- a/patches/tk-8.7a1.local.patch +++ b/patches/tk-8.7a1.local.patch @@ -1,23 +1,33 @@ -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 @@ +diff -ru tk8.7a1.orig/unix/configure tk8.7a1/unix/configure +--- tk8.7a1.orig/unix/configure 2023-03-30 14:25:29.062891597 +0200 ++++ tk8.7a1/unix/configure 2023-03-30 14:25:08.830891475 +0200 +@@ -7752,8 +7752,8 @@ + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ +- ac_x_includes='$ac_x_includes'\ +- ac_x_libraries='$ac_x_libraries'" ++ ac_x_includes=''\ ++ ac_x_libraries=''" + esac + fi + ;; #( +@@ -8054,13 +8054,20 @@ { $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 -+ ++ 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" ++ XFT_CFLAGS=`"${PKG_CONFIG}" --cflags 2>/dev/null` || found_xft="no" ++ XFT_LIBS=`"${PKG_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" |