Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
b829ff2a
Unverified
Commit
b829ff2a
authored
Dec 04, 2018
by
Adam Cozzette
Committed by
GitHub
Dec 04, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5424 from acozzette/mac-python-fix
Cherry-picked fix from #5406
parents
d0d94553
4bb130e7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
0 deletions
+28
-0
build_artifacts.sh
kokoro/release/python/linux/build_artifacts.sh
+1
-0
build_artifacts.sh
kokoro/release/python/macos/build_artifacts.sh
+1
-0
build_artifacts.bat
kokoro/release/python/windows/build_artifacts.bat
+10
-0
setup.py
python/setup.py
+16
-0
No files found.
kokoro/release/python/linux/build_artifacts.sh
View file @
b829ff2a
...
@@ -43,3 +43,4 @@ build_artifact_version 2.7
...
@@ -43,3 +43,4 @@ build_artifact_version 2.7
build_artifact_version 3.4
build_artifact_version 3.4
build_artifact_version 3.5
build_artifact_version 3.5
build_artifact_version 3.6
build_artifact_version 3.6
build_artifact_version 3.7
kokoro/release/python/macos/build_artifacts.sh
View file @
b829ff2a
...
@@ -45,3 +45,4 @@ build_artifact_version 2.7
...
@@ -45,3 +45,4 @@ build_artifact_version 2.7
build_artifact_version 3.4
build_artifact_version 3.4
build_artifact_version 3.5
build_artifact_version 3.5
build_artifact_version 3.6
build_artifact_version 3.6
build_artifact_version 3.7
kokoro/release/python/windows/build_artifacts.bat
View file @
b829ff2a
...
@@ -51,3 +51,13 @@ SET PYTHON=C:\python36
...
@@ -51,3 +51,13 @@ SET PYTHON=C:\python36
SET PYTHON_VERSION=3.6
SET PYTHON_VERSION=3.6
SET PYTHON_ARCH=64
SET PYTHON_ARCH=64
CALL build_single_artifact.bat
CALL build_single_artifact.bat
SET PYTHON=C:\python37_32bit
SET PYTHON_VERSION=3.7
SET PYTHON_ARCH=32
CALL build_single_artifact.bat
SET PYTHON=C:\python37
SET PYTHON_VERSION=3.7
SET PYTHON_ARCH=64
CALL build_single_artifact.bat
python/setup.py
View file @
b829ff2a
#! /usr/bin/env python
#! /usr/bin/env python
#
#
# See README for usage instructions.
# See README for usage instructions.
from
distutils
import
util
import
glob
import
glob
import
os
import
os
import
pkg_resources
import
re
import
subprocess
import
subprocess
import
sys
import
sys
import
sysconfig
import
platform
import
platform
# We must use setuptools, not distutils, because we need to use the
# We must use setuptools, not distutils, because we need to use the
...
@@ -186,6 +190,18 @@ if __name__ == '__main__':
...
@@ -186,6 +190,18 @@ if __name__ == '__main__':
extra_compile_args
.
append
(
'-Wno-invalid-offsetof'
)
extra_compile_args
.
append
(
'-Wno-invalid-offsetof'
)
extra_compile_args
.
append
(
'-Wno-sign-compare'
)
extra_compile_args
.
append
(
'-Wno-sign-compare'
)
# https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
# C++ projects must now migrate to libc++ and are recommended to set a
# deployment target of macOS 10.9 or later, or iOS 7 or later.
if
sys
.
platform
==
'darwin'
:
mac_target
=
sysconfig
.
get_config_var
(
'MACOSX_DEPLOYMENT_TARGET'
)
if
mac_target
and
(
pkg_resources
.
parse_version
(
mac_target
)
<
pkg_resources
.
parse_version
(
'10.9.0'
)):
os
.
environ
[
'MACOSX_DEPLOYMENT_TARGET'
]
=
'10.9'
os
.
environ
[
'_PYTHON_HOST_PLATFORM'
]
=
re
.
sub
(
r'macosx-[0-9]+\.[0-9]+-(.+)'
,
r'macosx-10.9-\1'
,
util
.
get_platform
())
# https://github.com/Theano/Theano/issues/4926
# https://github.com/Theano/Theano/issues/4926
if
sys
.
platform
==
'win32'
:
if
sys
.
platform
==
'win32'
:
extra_compile_args
.
append
(
'-D_hypot=hypot'
)
extra_compile_args
.
append
(
'-D_hypot=hypot'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment