projects / packages / apache-mod_pagespeed.git / blame
| Commit | Line | Data |
|---|---|---|
| 2022f310 JB |
1 | --- modpagespeed-1.9.32.4/third_party/protobuf/protobuf.gyp.orig 2015-07-14 01:17:15.000000000 +0200 |
| 2 | +++ modpagespeed-1.9.32.4/third_party/protobuf/protobuf.gyp 2020-07-05 14:36:08.211183327 +0200 | |
| 3 | @@ -430,6 +430,33 @@ | |
| 4 | }, | |
| 5 | }, | |
| 6 | { | |
| 7 | + 'target_name': 'protobuf_full_do_not_use', | |
| 8 | + 'type': 'none', | |
| 9 | + 'direct_dependent_settings': { | |
| 10 | + 'cflags': [ | |
| 11 | + '<!@(pkg-config --cflags protobuf)', | |
| 12 | + ], | |
| 13 | + 'defines': [ | |
| 14 | + 'USE_SYSTEM_PROTOBUF', | |
| 15 | + | |
| 16 | + # This macro must be defined to suppress the use | |
| 17 | + # of dynamic_cast<>, which requires RTTI. | |
| 18 | + 'GOOGLE_PROTOBUF_NO_RTTI', | |
| 19 | + 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER', | |
| 20 | + ], | |
| 21 | + }, | |
| 22 | + 'link_settings': { | |
| 23 | + # Use full protobuf, because vanilla protobuf doesn't have | |
| 24 | + # our custom patch to retain unknown fields in lite mode. | |
| 25 | + 'ldflags': [ | |
| 26 | + '<!@(pkg-config --libs-only-L --libs-only-other protobuf)', | |
| 27 | + ], | |
| 28 | + 'libraries': [ | |
| 29 | + '<!@(pkg-config --libs-only-l protobuf)', | |
| 30 | + ], | |
| 31 | + }, | |
| 32 | + }, | |
| 33 | + { | |
| 34 | 'target_name': 'protoc', | |
| 35 | 'type': 'none', | |
| 36 | 'toolsets': ['host', 'target'], | |
| 37 | --- modpagespeed-1.9.32.4/pagespeed/kernel.gyp.orig 2015-07-14 01:16:53.000000000 +0200 | |
| 38 | +++ modpagespeed-1.9.32.4/pagespeed/kernel.gyp 2020-07-05 16:37:30.784292901 +0200 | |
| 39 | @@ -16,8 +16,14 @@ | |
| 40 | 'variables': { | |
| 41 | 'instaweb_root': '..', | |
| 42 | 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/instaweb', | |
| 43 | + 'conditions': [ | |
| 44 | + [ 'use_system_protobuf==1', { | |
| 45 | + 'protoc_executable': '<!(which protoc)', | |
| 46 | + }, { | |
| 47 | 'protoc_executable': | |
| 48 | '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', | |
| 49 | + }], | |
| 50 | + ], | |
| 51 | 'data2c_out_dir': '<(SHARED_INTERMEDIATE_DIR)/data2c_out/instaweb', | |
| 52 | 'data2c_exe': | |
| 53 | '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)instaweb_data2c<(EXECUTABLE_SUFFIX)', | |
| 54 | --- modpagespeed-1.9.32.4/net/instaweb/instaweb.gyp.orig 2015-07-14 01:16:53.000000000 +0200 | |
| 55 | +++ modpagespeed-1.9.32.4/net/instaweb/instaweb.gyp 2020-07-05 16:44:07.851679301 +0200 | |
| 56 | @@ -16,8 +16,14 @@ | |
| 57 | 'variables': { | |
| 58 | 'instaweb_root': '../..', | |
| 59 | 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/instaweb', | |
| 60 | + 'conditions': [ | |
| 61 | + [ 'use_system_protobuf==1', { | |
| 62 | + 'protoc_executable': '<!(which protoc)', | |
| 63 | + }, { | |
| 64 | 'protoc_executable': | |
| 65 | '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', | |
| 66 | + }], | |
| 67 | + ], | |
| 68 | 'data2c_out_dir': '<(SHARED_INTERMEDIATE_DIR)/data2c_out/instaweb', | |
| 69 | 'data2c_exe': | |
| 70 | '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)instaweb_data2c<(EXECUTABLE_SUFFIX)', | |
| 71 | --- modpagespeed-1.9.32.4/net/instaweb/protoc.gypi.orig 2015-07-14 01:16:53.000000000 +0200 | |
| 72 | +++ modpagespeed-1.9.32.4/net/instaweb/protoc.gypi 2020-07-05 17:00:48.997260176 +0200 | |
| 73 | @@ -30,7 +30,7 @@ | |
| 74 | 'action': [ | |
| 75 | 'bash', | |
| 76 | '-c', | |
| 77 | - 'cat <(instaweb_root)/<(instaweb_protoc_subdir)/<(RULE_INPUT_NAME) | sed \'s!"third_party/pagespeed!"pagespeed!\' | sed \'s!// \[opensource\] !!\' > <(protoc_out_dir)/<(instaweb_protoc_subdir)/<(RULE_INPUT_ROOT).proto && <(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX) --proto_path=<(protoc_out_dir)/ <(protoc_out_dir)/<(instaweb_protoc_subdir)/<(RULE_INPUT_ROOT).proto --cpp_out=<(protoc_out_dir)', | |
| 78 | + 'cat <(instaweb_root)/<(instaweb_protoc_subdir)/<(RULE_INPUT_NAME) | sed \'s!"third_party/pagespeed!"pagespeed!\' | sed \'s!// \[opensource\] !!\' > <(protoc_out_dir)/<(instaweb_protoc_subdir)/<(RULE_INPUT_ROOT).proto && <(protoc_executable) --proto_path=<(protoc_out_dir)/ <(protoc_out_dir)/<(instaweb_protoc_subdir)/<(RULE_INPUT_ROOT).proto --cpp_out=<(protoc_out_dir)', | |
| 79 | ], | |
| 80 | }, | |
| 81 | ], |