GeezerVison is showing github.com — Make --shared on AIX work (shared library support) by sxa · Pull Request #9675 · nodejs/node
Make --shared on AIX work (shared library support)
#9675
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.
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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter
Filter by extension
.gyp
(1)
.py
(2)
No extension
(2)
All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Hide whitespace
Diff view
Hide whitespace
There are no files selected for viewing
9 changes: 8 additions & 1 deletion
9
configure
Original file line number
Diff line number
Diff line change
Expand Up
@@ -848,7 +848,14 @@ def configure_node(o):
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
o['variables']['node_shared'] = b(options.shared)
node_module_version = getmoduleversion.get_version()
shlib_suffix = '%s.dylib' if sys.platform == 'darwin' else 'so.%s'
if sys.platform == 'darwin':
shlib_suffix = '%s.dylib'
elif sys.platform.startswith('aix'):
shlib_suffix = '%s.a'
else:
shlib_suffix = 'so.%s'
shlib_suffix %= node_module_version
o['variables']['node_module_version'] = int(node_module_version)
o['variables']['shlib_suffix'] = shlib_suffix
Expand Down
10 changes: 9 additions & 1 deletion
10
node.gyp
Original file line number
Diff line number
Diff line change
Expand Up
@@ -928,7 +928,15 @@
'targets': [
{
'target_name': 'node',
'type': 'executable',
'conditions': [
['node_shared=="true"', {
'type': 'shared_library',
'ldflags': ['--shared'],
'product_extension': '<(shlib_suffix)',
}, {
'type': 'executable',
}],
],
'dependencies': ['<(node_core_target_name)', 'node_exp'],
'include_dirs': [
Expand Down
Original file line number
Diff line number
Diff line change
@@ -1,9 +1,10 @@
# Names should be added to this file like so:
# Name or Organization <email address>
Google Inc.
Bloomberg Finance L.P.
Yandex LLC
Google Inc. <*@google.com>
Bloomberg Finance L.P. <*@bloomberg.net>
IBM Inc. <*@*.ibm.com>
Yandex LLC <*@yandex-team.ru>
Steven Knight <[email protected] >
Ryan Norton <[email protected] >
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -73,23 +73,15 @@
]
def CheckChangeOnUpload (input_api , output_api ):
report = []
report .extend (input_api .canned_checks .PanProjectChecks (
input_api , output_api ))
return report
def CheckChangeOnCommit (input_api , output_api ):
report = []
def _LicenseHeader (input_api ):
# Accept any year number from 2009 to the current year.
current_year = int (input_api .time .strftime ('%Y' ))
allowed_years = (str (s ) for s in reversed (xrange (2009 , current_year + 1 )))
years_re = '(' + '|' .join (allowed_years ) + ')'
# The (c) is deprecated, but tolerate it until it's removed from all files.
license = (
return (
r'.*? Copyright (\(c\) )?%(year)s Google Inc\. All rights reserved\.\n'
r'.*? Use of this source code is governed by a BSD-style license that '
r'can be\n'
Expand All
@@ -98,8 +90,18 @@ def CheckChangeOnCommit(input_api, output_api):
'year' : years_re ,
}
def CheckChangeOnUpload (input_api , output_api ):
report = []
report .extend (input_api .canned_checks .PanProjectChecks (
input_api , output_api , license_header = _LicenseHeader (input_api )))
return report
def CheckChangeOnCommit (input_api , output_api ):
report = []
report .extend (input_api .canned_checks .PanProjectChecks (
input_api , output_api , license_header = license ))
input_api , output_api , license_header = _LicenseHeader ( input_api ) ))
report .extend (input_api .canned_checks .CheckTreeIsOpen (
input_api , output_api ,
'http://gyp-status.appspot.com/status' ,
Expand Down
Original file line number
Diff line number
Diff line change
Expand Up
@@ -92,7 +92,10 @@ def CalculateVariables(default_variables, params):
if flavor == 'android' :
operating_system = 'linux' # Keep this legacy behavior for now.
default_variables .setdefault ('OS' , operating_system )
default_variables .setdefault ('SHARED_LIB_SUFFIX' , '.so' )
if flavor == 'aix' :
default_variables .setdefault ('SHARED_LIB_SUFFIX' , '.a' )
else :
default_variables .setdefault ('SHARED_LIB_SUFFIX' , '.so' )
default_variables .setdefault ('SHARED_LIB_DIR' ,'$(builddir)/lib.$(TOOLSET)' )
default_variables .setdefault ('LIB_DIR' , '$(obj).$(TOOLSET)' )
Expand Down
Expand Up
@@ -1349,7 +1352,10 @@ def ComputeOutputBasename(self, spec):
if target [:3 ] == 'lib' :
target = target [3 :]
target_prefix = 'lib'
target_ext = '.so'
if self .flavor == 'aix' :
target_ext = '.a'
else :
target_ext = '.so'
elif self .type == 'none' :
target = '%s.stamp' % target
elif self .type != 'executable' :
Expand Down
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.