Skip to content

deps: float gyp patch for long filenames #7963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 3 commits into from
+6 −1
Closed

deps: float gyp patch for long filenames #7963

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30a0d62
deps: float gyp patch for long filenames
addaleax May 27, 2016
b03cca1
fix nit
addaleax Aug 3, 2016
b31e34c
no python 2.4 support
addaleax Aug 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
no python 2.4 support
  • Loading branch information
@addaleax
addaleax committed Aug 4, 2016
commit b31e34c243729dd1be18c1c12d2e484bb78543b6
13 changes: 2 additions & 11 deletions tools/gyp/pylib/gyp/generator/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,7 @@
from gyp.common import GetEnvironFallback
from gyp.common import GypError

# hashlib is supplied as of Python 2.5 as the replacement interface for sha
# and other secure hashes. In 2.6, sha is deprecated. Import hashlib if
# available, avoiding a deprecation warning under 2.6. Import sha otherwise,
# preserving 2.4 compatibility.
try:
import hashlib
_new_sha1 = hashlib.sha1
except ImportError:
import sha
_new_sha1 = sha.new
import hashlib

generator_default_variables = {
'EXECUTABLE_PREFIX': '',
Expand Down Expand Up @@ -1756,7 +1747,7 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
# - The multi-output rule will have an do-nothing recipe.

# Hash the target name to avoid generating overlong filenames.
cmddigest = _new_sha1(command if command else self.target).hexdigest()
cmddigest = hashlib.sha1(command if command else self.target).hexdigest()
intermediate = "%s.intermediate" % cmddigest
self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
self.WriteLn('\t%s' % '@:');
Expand Down