PKGBUILDs/extra/chromium/chromium-system-harfbuzz-r0.patch

45 lines
1.5 KiB
Diff
Raw Normal View History

2013-06-18 14:54:36 +00:00
Index: build/linux/unbundle/harfbuzz.gyp
diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/harfbuzz.gyp
index 456dd384df2d5c57d9857cfb775d46ef87add2bc..93b2a69c12d7b7524fa0c2aa67b52136b779196d 100644
--- a/build/linux/unbundle/harfbuzz.gyp
+++ b/build/linux/unbundle/harfbuzz.gyp
@@ -3,24 +3,34 @@
# found in the LICENSE file.
{
+ 'variables': {
+ # Check for presence of harfbuzz-icu library, use it if present.
+ 'harfbuzz_libraries':
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "int main() { return 0; }" '
+ '--run-linker '
+ '--on-success "harfbuzz harfbuzz-icu" '
+ '--on-failure "harfbuzz" '
+ '-- -lharfbuzz-icu)',
+ },
'targets': [
{
'target_name': 'harfbuzz-ng',
'type': 'none',
'cflags': [
- '<!@(pkg-config --cflags harfbuzz)',
+ '<!@(pkg-config --cflags <(harfbuzz_libraries))',
],
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags harfbuzz)',
+ '<!@(pkg-config --cflags <(harfbuzz_libraries))',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
+ '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))',
],
'libraries': [
- '<!@(pkg-config --libs-only-l harfbuzz)',
+ '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))',
],
},
},