diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-22 12:04:22 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-22 17:08:29 +0200 |
| commit | 0ba159e33bb8f47250f57f377af40f7ca941c89c (patch) | |
| tree | 618abd276200c03f3673a84974e6dfe3a213426f | |
| parent | 1cabbe033b395d5de985dd77ecd26dfc39a6feeb (diff) | |
Blind attempt to fix HarfBuzz build
Change-Id: Iaa61bc2c82ab6bd6391c8c81951ca55c5ce133ab
| -rw-r--r-- | harfbuzz/harfbuzz.configure.patch.1 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/harfbuzz/harfbuzz.configure.patch.1 b/harfbuzz/harfbuzz.configure.patch.1 index 937a06e01f99..c66e2b74d60a 100644 --- a/harfbuzz/harfbuzz.configure.patch.1 +++ b/harfbuzz/harfbuzz.configure.patch.1 @@ -64,7 +64,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure fi if test "$have_icu_le" != "true"; then if test -n "$ac_tool_prefix"; then -@@ -17555,7 +17555,7 @@ +@@ -17555,12 +17555,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using icu-config fallback" >&5 $as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; } if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then @@ -73,6 +73,12 @@ diff -ur harfbuzz.org/configure harfbuzz/configure # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. + ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags` +- ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-layout` ++ ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-layout | tr "\n" " "` + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -17654,7 +17654,7 @@ GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |