summaryrefslogtreecommitdiffstats
path: root/third_party/instrumented_libraries/instrumented_libraries.gyp
diff options
context:
space:
mode:
authorearthdok <earthdok@chromium.org>2014-11-12 06:19:33 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-12 14:19:54 +0000
commitb86366972c7f6b956bc56528287b7d1ab7ed0b71 (patch)
treef7291c67bae4007cd28bf0eacae56a357c3316c7 /third_party/instrumented_libraries/instrumented_libraries.gyp
parentcdd5b678f2d6ae6521f2e94f3b3c7e5e0876638a (diff)
downloadchromium_src-b86366972c7f6b956bc56528287b7d1ab7ed0b71.zip
chromium_src-b86366972c7f6b956bc56528287b7d1ab7ed0b71.tar.gz
chromium_src-b86366972c7f6b956bc56528287b7d1ab7ed0b71.tar.bz2
Instrumented libraries: fix pulseaudio on Trusty, again.
libpulsecommon has moved to <libdir>/pulseaudio/. Update RPATH so that instrumented libpulsecommon could be picked up from the new location. This is not ideal as RPATH in libpulsecommon itself is still wrong. If that bites us, we'll need to either fix it separately or just move libpulsecommon to <libdir>. The latter approach would also help with other packages that might depend on it. BUG=414189 TBR=glider@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/719083002 Cr-Commit-Position: refs/heads/master@{#303830}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
-rw-r--r--third_party/instrumented_libraries/instrumented_libraries.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 1e70ec0..8e66d8b 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -424,6 +424,9 @@
['"<(_ubuntu_release)"=="precise"', {
'patch': 'patches/pulseaudio.precise.diff',
'jobs': 1,
+ }, {
+ # New location of libpulsecommon.
+ 'package_ldflags': [ '-Wl,-R,XORIGIN/pulseaudio/.' ],
}],
],
'extra_configure_flags': [