Skip to content
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

[python] build with ucs4 #191

Merged
merged 2 commits into from
Jun 4, 2018
Merged

[python] build with ucs4 #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4882fa
[python] build with ucs4
truthbk Apr 17, 2018
7a2e57e
[python] UCS4 only on linux for now
truthbk Jun 4, 2018
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
4 changes: 3 additions & 1 deletion config/software/python.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@
"--enable-universalsdk=/",
"--prefix=#{install_dir}/embedded"]

if ohai["platform_family"] == "mac_os_x"
if mac_os_x?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be osx? I think: https://github.com/DataDog/dd-agent-omnibus/blob/5.22.3/lib/ostools.rb#L16-L18 & https://github.com/DataDog/datadog-agent/blob/6.2.1/omnibus/lib/ostools.rb#L20-L22

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have this in multiple recipes though...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok this one is actually provided by chef-sugar

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future we should probably get rid of our lib/ostools.rb and use the sugar-provided stuff directly instead

python_configure.push("--enable-ipv6",
"--with-universal-archs=intel",
"--enable-shared")
elsif linux?
python_configure.push("--enable-unicode=ucs4")
end

python_configure.push("--with-dbmliborder=")
Expand Down