diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-04-24 14:22:53 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-04-24 14:22:53 +0200 |
| commit | 16385c4d1c24a05a7d364854b0a437006eb1e333 (patch) | |
| tree | b3daf6b783dd62c1e97ce1fe65bca2886dc292c9 /harfbuzz | |
| parent | 59360fa215cf61b0e5f9a36f017e9525546b6044 (diff) | |
fix harfbuzz build
icu-config could print the list of libraries on more lines. We need
one line for the variable.
Change-Id: I08a0415c2c3baa226e9cd32e0c3da7d384511f87
Diffstat (limited to 'harfbuzz')
| -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..ffabde56c566 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-libsonly --ldflags-layout` ++ ICU_LE_LIBS=`$ICU_CONFIG --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 |