diff options
Diffstat (limited to 'www/chromium/files/patch-third_party__libusb__libusb.gyp')
| -rw-r--r-- | www/chromium/files/patch-third_party__libusb__libusb.gyp | 76 |
1 files changed, 47 insertions, 29 deletions
diff --git a/www/chromium/files/patch-third_party__libusb__libusb.gyp b/www/chromium/files/patch-third_party__libusb__libusb.gyp index 1965efd44b86..bc5021948fb4 100644 --- a/www/chromium/files/patch-third_party__libusb__libusb.gyp +++ b/www/chromium/files/patch-third_party__libusb__libusb.gyp @@ -1,38 +1,44 @@ ---- third_party/libusb/libusb.gyp.orig -+++ third_party/libusb/libusb.gyp -@@ -10,23 +10,36 @@ +--- third_party/libusb/libusb.gyp.orig 2013-04-30 10:21:05.000000000 +0300 ++++ third_party/libusb/libusb.gyp 2013-05-08 20:58:00.000000000 +0300 +@@ -10,31 +10,43 @@ { 'target_name': 'libusb', 'conditions': [ -- ['OS == "linux" and use_system_libusb', { -+ ['(OS == "linux" or os_bsd == 1) and use_system_libusb', { - 'type': 'none', +- ['OS == "linux" and use_system_libusb==1', { +- 'type': 'none', +- 'variables': { +- 'headers_root_path': 'src/libusb', +- 'header_filenames': [ +- 'libusb.h', +- ], +- }, +- 'includes': [ +- '../../build/shim_headers.gypi', +- ], ++ ['(OS == "linux" or os_bsd == 1) and use_system_libusb==1', { ++ 'type': 'none', 'direct_dependent_settings': { - 'defines': [ - 'USE_SYSTEM_LIBUSB', - ], - 'cflags': [ - '<!@(pkg-config --cflags libusb-1.0)', -- ], -- 'link_settings': { -- 'ldflags': [ -- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)', -- ], -- 'libraries': [ -- '<!@(pkg-config --libs-only-l libusb-1.0)', -- ], -- }, + 'conditions': [ + ['OS == "freebsd"', { -+ 'link_settings': { -+ 'libraries': [ -+ '-lusb', ++ 'direct_dependent_settings': { ++ 'link_settings': { ++ 'libraries': [ ++ '-lusb', ++ ], ++ }, ++ }, ++ }, { ++ 'variables': { ++ 'headers_root_path': 'src/libusb', ++ 'header_filenames': [ ++ 'libusb.h', + ], + }, -+ 'defines': [ -+ 'LIBUSB_CALL=', ++ 'includes': [ ++ '../../build/shim_headers.gypi', + ], -+ }, { + 'cflags': [ + '<!@(pkg-config --cflags libusb-1.0)', + ], @@ -44,8 +50,20 @@ + '<!@(pkg-config --libs-only-l libusb-1.0)', + ], + }, -+ }], -+ ], - }, - }, { - 'type': '<(library)', ++ }], + ], +- 'link_settings': { +- 'ldflags': [ +- '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)', +- ], +- 'libraries': [ +- '<!@(pkg-config --libs-only-l libusb-1.0)', +- ], +- }, +- }, +- }, { ++ }, ++ }, { + 'type': 'static_library', + 'sources': [ + 'src/libusb/core.c', |