|
|
Created:
4 years, 9 months ago by Xianzhu Modified:
4 years, 9 months ago CC:
chromium-reviews, darin-cc_chromium.org, jam, jochen+watch_chromium.org, mkwst+moarreviews-shell_chromium.org, mlamouri+watch-content_chromium.org, Peter Beverloo Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionSet rpath to let content_shell find our own libfreetype
We always build third_party/freetype2 as a dynamic library even for
static build to avoid symbol conflicts. We need to explicitly set
rpath for static build [1] to let content_shell find our own
libfreetype instead of the system one.
[1] We omit rpath for static gn builds. See
https://codereview.chromium.org/1535863002.
Committed: https://crrev.com/1a34fa31d0bc9b1e77ca31019e5c327cbf866826
Cr-Commit-Position: refs/heads/master@{#380463}
Patch Set 1 #
Total comments: 3
Messages
Total messages: 19 (9 generated)
wangxianzhu@chromium.org changed reviewers: + dpranke@chromium.org, mkwst@chromium.org
Description was changed from ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build because of symbol conflicts. We need to explicit set rpath for static build (which omit rpath by default) to let content_shell find our own libfreetype instead of the system one. ========== to ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build because of symbol conflicts. We need to explicit set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. ==========
Description was changed from ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build because of symbol conflicts. We need to explicit set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. ========== to ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build to avoid symbol conflicts. We need to explicitly set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. ==========
https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn File content/shell/BUILD.gn (right): https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn#newc... content/shell/BUILD.gn:469: } This is basically the right fix, but I think it might be better to make this config be a part of the public_configs for freetype2 (i.e., move this line to //third_party/freetype2/BUILD.gn:12). That way things can't get out of sync. Does that work?
Either way, LGTM. https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn File content/shell/BUILD.gn (right): https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn#newc... content/shell/BUILD.gn:469: } On 2016/03/10 at 01:37:12, Dirk Pranke wrote: > This is basically the right fix, but I think it might be better to make this config be a part of the public_configs for freetype2 (i.e., move this line to //third_party/freetype2/BUILD.gn:12). > > That way things can't get out of sync. > > Does that work? I'd be fine with that.
https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn File content/shell/BUILD.gn (right): https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn#newc... content/shell/BUILD.gn:469: } On 2016/03/10 01:37:12, Dirk Pranke wrote: > This is basically the right fix, but I think it might be better to make this > config be a part of the public_configs for freetype2 (i.e., move this line to > //third_party/freetype2/BUILD.gn:12). > > That way things can't get out of sync. > > Does that work? I think the current method is better because: - It's consistent with the method used for other binaries in the similar situation (https://codereview.chromium.org/1535863002); - It can also handle other dynamic libraries (if any) linked to content_shell.
On 2016/03/10 17:31:27, Xianzhu wrote: > https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn > File content/shell/BUILD.gn (right): > > https://codereview.chromium.org/1781903002/diff/1/content/shell/BUILD.gn#newc... > content/shell/BUILD.gn:469: } > On 2016/03/10 01:37:12, Dirk Pranke wrote: > > This is basically the right fix, but I think it might be better to make this > > config be a part of the public_configs for freetype2 (i.e., move this line to > > //third_party/freetype2/BUILD.gn:12). > > > > That way things can't get out of sync. > > > > Does that work? > > I think the current method is better because: > - It's consistent with the method used for other binaries in the similar > situation (https://codereview.chromium.org/1535863002); > - It can also handle other dynamic libraries (if any) linked to content_shell. Okay, I don't feel that strongly about my suggestion, so this was is fine as well. lgtm.
The CQ bit was checked by wangxianzhu@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1781903002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1781903002/1
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
Patchset #2 (id:20001) has been deleted
The CQ bit was checked by wangxianzhu@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1781903002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1781903002/1
Message was sent while issue was closed.
Description was changed from ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build to avoid symbol conflicts. We need to explicitly set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. ========== to ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build to avoid symbol conflicts. We need to explicitly set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. ==========
Message was sent while issue was closed.
Committed patchset #1 (id:1)
Message was sent while issue was closed.
Description was changed from ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build to avoid symbol conflicts. We need to explicitly set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. ========== to ========== Set rpath to let content_shell find our own libfreetype We always build third_party/freetype2 as a dynamic library even for static build to avoid symbol conflicts. We need to explicitly set rpath for static build [1] to let content_shell find our own libfreetype instead of the system one. [1] We omit rpath for static gn builds. See https://codereview.chromium.org/1535863002. Committed: https://crrev.com/1a34fa31d0bc9b1e77ca31019e5c327cbf866826 Cr-Commit-Position: refs/heads/master@{#380463} ==========
Message was sent while issue was closed.
Patchset 1 (id:??) landed as https://crrev.com/1a34fa31d0bc9b1e77ca31019e5c327cbf866826 Cr-Commit-Position: refs/heads/master@{#380463} |