Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Issue 1151753002: Fix use of 'sysroot' variable in harfbuzz.gyp (Closed)

Created:
5 years, 7 months ago by Sam Clegg
Modified:
5 years, 7 months ago
CC:
chromium-reviews, feature-media-reviews_chromium.org, cbentzel+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix use of 'sysroot' variable in harfbuzz.gyp The sysroot variable is set conditionally in common.gypi but not at the nesting level required for other conditional to depend on it like the one in hardbuzz does. This means that sysroot always appeared to be empty to harfbuzz.gyp, and hence the special handling for ARM linux was required. This change moves the setting of 'sysroot' up one level of nesting and defines 'pkg-config' in common.gypi so it can be shared. Committed: https://crrev.com/6a80b32f309490f44347f2925589a6f0fc23c3ff Cr-Commit-Position: refs/heads/master@{#331506}

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Patch Set 5 : rebase #

Patch Set 6 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+34 lines, -88 lines) Patch
M build/common.gypi View 1 2 3 4 5 6 chunks +34 lines, -23 lines 0 comments Download
M build/linux/system.gyp View 1 chunk +0 lines, -8 lines 0 comments Download
M chrome/chrome_browser_chromeos.gypi View 1 2 3 4 1 chunk +0 lines, -7 lines 0 comments Download
M media/media.gyp View 1 1 chunk +0 lines, -5 lines 0 comments Download
M net/third_party/nss/ssl.gyp View 1 chunk +0 lines, -16 lines 0 comments Download
M third_party/harfbuzz-ng/harfbuzz.gyp View 1 2 2 chunks +0 lines, -18 lines 0 comments Download
M third_party/libexif/libexif.gyp View 1 chunk +0 lines, -11 lines 0 comments Download

Messages

Total messages: 28 (13 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1151753002/60001
5 years, 7 months ago (2015-05-22 20:22:11 UTC) #6
Sam Clegg
5 years, 7 months ago (2015-05-22 21:17:31 UTC) #7
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 7 months ago (2015-05-22 21:34:01 UTC) #9
Dirk Pranke
lgtm
5 years, 7 months ago (2015-05-22 22:08:59 UTC) #10
Sam Clegg
+cpu for top level OWNERS
5 years, 7 months ago (2015-05-22 22:16:32 UTC) #11
Sam Clegg
+cpu for top level OWNERS
5 years, 7 months ago (2015-05-22 23:58:34 UTC) #13
cpu_(ooo_6.6-7.5)
lgtm
5 years, 7 months ago (2015-05-26 17:45:32 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1151753002/60001
5 years, 7 months ago (2015-05-26 17:46:17 UTC) #16
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_compile_dbg_32_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_compile_dbg_32_ng/builds/56272) ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED, ...
5 years, 7 months ago (2015-05-26 17:53:44 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1151753002/100001
5 years, 7 months ago (2015-05-26 18:00:16 UTC) #21
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_rel_ng on tryserver.chromium.win (JOB_TIMED_OUT, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/62540)
5 years, 7 months ago (2015-05-27 00:02:08 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1151753002/100001
5 years, 7 months ago (2015-05-27 00:18:03 UTC) #25
commit-bot: I haz the power
Committed patchset #6 (id:100001)
5 years, 7 months ago (2015-05-27 01:23:37 UTC) #26
commit-bot: I haz the power
Patchset 6 (id:??) landed as https://crrev.com/6a80b32f309490f44347f2925589a6f0fc23c3ff Cr-Commit-Position: refs/heads/master@{#331506}
5 years, 7 months ago (2015-05-27 01:25:12 UTC) #27
spang
5 years, 7 months ago (2015-05-27 20:40:30 UTC) #28
Message was sent while issue was closed.
A revert of this CL (patchset #6 id:100001) has been created in
https://codereview.chromium.org/1154213004/ by spang@chromium.org.

The reason for reverting is: Breaks GYP for Chrome OS builds. Repro steps:

 cros chrome-sdk --board=amd64-generic
 gclient runhooks

Updating projects from gyp files...
/bin/sh: /build/amd64-generic/build/bin/pkg-config: No such file or directory
gyp: Call to '/build/amd64-generic/build/bin/pkg-config --libs-only-l nss | sed
-e "s/-lssl3//"' returned exit status 0.
/bin/sh: /build/amd64-generic/build/bin/pkg-config: No such file or directory
gyp: Call to '/build/amd64-generic/build/bin/pkg-config --libs libcras' returned
exit status 127.
/bin/sh: /build/amd64-generic/build/bin/pkg-config: No such file or directory
gyp: Call to '/build/amd64-generic/build/bin/pkg-config --cflags x11' returned
exit status 127.
Error: Command /usr/bin/python src/build/gyp_chromium returned non-zero exit
status 1 in /ssd/src/chromium

TEST=cros chrome-sdk --board=amd64-generic && gclient runhooks.

Powered by Google App Engine
This is Rietveld 408576698