Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

phantomjs 2.0.1 #47908

Closed
wants to merge 2 commits into from
Closed

phantomjs 2.0.1 #47908

wants to merge 2 commits into from

Conversation

dunn
Copy link
Contributor

@dunn dunn commented Jan 10, 2016

MikeMcQuaid and others added 2 commits January 9, 2016 19:33
Use Vitallium's fork temporarily until 2.1.0 gets released.
@dunn dunn changed the title Phantomjs phantomjs 2.0.1 Jan 10, 2016
def install
system "./build.sh", "--confirm", "--jobs", ENV.make_jobs,
"--qt-config", "-openssl-linked"
inreplace "src/qt/preconfig.sh", "QT_CFG+=' -openssl -openssl-linked'",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure if this is something that needs to be fixed upstream; is there a way to pass the OpenSSL flags via build.sh?

Copy link
Member

Choose a reason for hiding this comment

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

It may be worth investigating if we can use -no-openssl -securetransport but that can be in a future PR.

Choose a reason for hiding this comment

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

Our build script can detect OpenSSL libraries and headers automatically now. Right now we have support for OpenSSL installed via brew or via Mac Ports. See here https://github.com/Vitallium/phantomjs/blob/master/build.py#L45 for more information.
if you want to pass additional arguments to qtconfig, you can use --qt-config command line argument. There is no needs to preconfig.sh. It's obsolete.

@MikeMcQuaid
Copy link
Member

Great work here @dunn. Merged as-is because I know how much people are clamoring for this. Comments could be touched upon in a future PR.

"--qt-config", "-openssl-linked"
inreplace "src/qt/preconfig.sh", "QT_CFG+=' -openssl -openssl-linked'",
"QT_CFG+=' -openssl -openssl-linked -I #{Formula["openssl"].opt_include} -L #{Formula["openssl"].opt_lib}'"
system "./build.sh", "--confirm", "--jobs", ENV.make_jobs

Choose a reason for hiding this comment

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

We don't have build.sh anymore. We switched to the unified Python script to build PhantomJS.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, good to know.

@dunn dunn deleted the phantomjs branch January 10, 2016 15:07
@Homebrew Homebrew locked and limited conversation to collaborators Jul 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants