Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

xulrunner: depends_on :xcode + specify MacOS.sdk_path #26862

Closed
wants to merge 1 commit into from

5 participants

@adamv
Owner

I would prefer to require Xcode as opposed to introducing complexity. What do others think?

@mistydemeo
Owner

Let's only require Xcode if we bottle it. We have a lot of CLT-only users.

@jacknagel
Owner

Note, we already have depends_on :xcode that wraps this requirement

@chrmoritz

I've added the custom Xcode requirement, because the default one does not suggest the without-webrtc option.

@mikemcquaid
Owner

We can bottle this.

@chrmoritz chrmoritz referenced this pull request from a commit in chrmoritz/homebrew
@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path
Fixes #26846
Closes #26862
e54d8da
@chrmoritz

looks like the sqlite mountain lion bottle sha1 is incorrect.

==> Downloading https://downloads.sf.net/project/machomebrew/Bottles/sqlite-3.8.3.mountain_lion.bottle.1.tar.gz
Error: SHA1 mismatch

Edit: The sha1 is correct, don't know what the bot is downloading.

@adamv
Owner

@BrewTestBot test this please

@BrewTestBot BrewTestBot referenced this pull request from a commit in BrewTestBot/homebrew
@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path Fixes #26846 Cl…
…oses #26862
10167b0
@adamv
Owner

Is this OK now?

@mikemcquaid
Owner

Looks like it may need rebased? Pull if you can.

@chrmoritz

Would you like me to push a rebase? (needs to merge the Formula[] change)

@mikemcquaid
Owner

@chrmoritz Please.

@chrmoritz chrmoritz referenced this pull request from a commit in chrmoritz/homebrew
@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path
Fixes #26846
Closes #26862
39bdddf
@chrmoritz

rebased and updated devel to 28.0b6

@BrewTestBot BrewTestBot referenced this pull request from a commit in BrewTestBot/homebrew
@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path Fixes #26846 Cl…
…oses #26862
4673f9c
@chrmoritz chrmoritz referenced this pull request from a commit in chrmoritz/homebrew
@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path
:python is :build dependency
Fixes #26846
Closes #26862
53bd549
@chrmoritz

python is a build only dependency (only used by build system) => updated PR

@adamv adamv commented on the diff
Library/Formula/xulrunner.rb
((6 lines not shown))
else
- tar_path = "objdir/dist/xulrunner-#{version}.en-US.mac64.tar.bz2"
+ tar_path = "objdir/dist/xulrunner-#{version.to_s[/\d+\.\d+(\.\d+)?/]}.en-US.mac64.tar.bz2"
@adamv Owner
adamv added a note

Can this be hardcoded instead of matched?

yes, but then is has to be updated with every stable/devel update (this removes the b6 part from the devel fersion number)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@adamv
Owner

Failing to build on Lion: ld: library not found for -lplc4

@chrmoritz

looks like nss has a rare issue with parallel builds (I never have seen this locally before). Should we use the homebrew provided nss instead of the nss which comes with xulrunner?

@adamv
Owner

Either use the Homebrew one or deparallelize the build.

@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path
:python is :build dependency + ENV.deparallelize
Fixes #26846
Closes #26862
3490d23
@chrmoritz

hombrews nss is way too outdated (no tls 1.1/2 support) and updating it needs some work (looks like they changed big parts of the build system in nss 3.15)

added ENV.deparallelize for now

@BrewTestBot BrewTestBot referenced this pull request from a commit in BrewTestBot/homebrew
@chrmoritz chrmoritz xulrunner: depends_on :xcode + specify MacOS.sdk_path :python is :bui…
…ld dependency + ENV.deparallelize Fixes #26846 Closes #26862
452ac4a
@adamv
Owner

Thanks for maintaining this.

Note, the commit message first line should be "short", so I broke it out into a bulleted list.

@adamv adamv closed this pull request from a commit
@chrmoritz chrmoritz xulrunner: fix build
* depends_on :xcode
* specify MacOS.sdk_path :python is :build dependency
* ENV.deparallelize

Fixes #26846.
Closes #26862.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
46a9af4
@adamv adamv closed this in 46a9af4
@freeyoung freeyoung referenced this pull request from a commit
@chrmoritz chrmoritz xulrunner: fix build
* depends_on :xcode
* specify MacOS.sdk_path :python is :build dependency
* ENV.deparallelize

Fixes #26846.
Closes #26862.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
37606eb
@verbitan verbitan referenced this pull request from a commit
@chrmoritz chrmoritz xulrunner: fix build
* depends_on :xcode
* specify MacOS.sdk_path :python is :build dependency
* ENV.deparallelize

Fixes #26846.
Closes #26862.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
bc6972f
@ehershey ehershey referenced this pull request from a commit in ehershey/homebrew
@chrmoritz chrmoritz xulrunner: fix build
* depends_on :xcode
* specify MacOS.sdk_path :python is :build dependency
* ENV.deparallelize

Fixes #26846.
Closes #26862.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
a2c8941
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 7, 2014
  1. @chrmoritz

    xulrunner: depends_on :xcode + specify MacOS.sdk_path

    chrmoritz authored
    :python is :build dependency + ENV.deparallelize
    Fixes #26846
    Closes #26862
This page is out of date. Refresh to see the latest.
Showing with 19 additions and 17 deletions.
  1. +19 −17 Library/Formula/xulrunner.rb
View
36 Library/Formula/xulrunner.rb
@@ -35,12 +35,12 @@ class Python273Requirement < Requirement
class Xulrunner < Formula
homepage "https://developer.mozilla.org/docs/XULRunner"
url "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/27.0.1/source/xulrunner-27.0.1.source.tar.bz2"
- sha1 'c9c5a6142fc9c50113c18eb8b1fb9249c08c4aac'
+ sha1 "c9c5a6142fc9c50113c18eb8b1fb9249c08c4aac"
devel do
- url "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/28.0b3/source/xulrunner-28.0b3.source.tar.bz2"
- sha1 'f35c986e2889dcee1d9f458ff7942ec6d3b1bbe9'
- version '28.0b3'
+ url "http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/28.0b8/source/xulrunner-28.0b8.source.tar.bz2"
+ sha1 "2c2bda033f7ce771b0aff82237551264911a32c3"
+ version "28.0b8"
end
head do
@@ -51,8 +51,9 @@ class Xulrunner < Formula
end
depends_on :macos => :lion # needs clang++
- depends_on Python273Requirement
- depends_on :python
+ depends_on :xcode
+ depends_on :python => :build
+ depends_on Python273Requirement => :build
depends_on "gnu-tar" => :build
depends_on "pkg-config" => :build
depends_on "yasm"
@@ -65,12 +66,6 @@ class Xulrunner < Formula
cause "Mozilla XULRunner only supports Clang on OS X"
end
- resource "mozconfig" do
- url "https://gist.github.com/chrmoritz/7815762/raw/d1ec6a29fe3ee2e59f39f854371ee9978cdb684a/mozconfig"
- sha1 "af105b46d126ee0b25f2f2487eb2b577725aa3c0"
- version "1.0"
- end
-
resource "autoconf213" do
url "http://ftpmirror.gnu.org/autoconf/autoconf-2.13.tar.gz"
mirror "http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz"
@@ -86,12 +81,21 @@ def install
ENV["AUTOCONF"] = buildpath/"ac213/bin/autoconf213"
end
- # build xulrunner to objdir and disable tests, updater.app and crashreporter.app
- buildpath.install resource("mozconfig")
+ # build xulrunner to objdir and disable tests, updater.app and crashreporter.app, specify sdk path
+ (buildpath/"mozconfig").write <<-EOS.undent
+ . $topsrcdir/xulrunner/config/mozconfig
+ mk_add_options MOZ_OBJDIR=objdir
+ ac_add_options --disable-tests
+ ac_add_options --disable-updater
+ ac_add_options --disable-crashreporter
+ ac_add_options --with-macos-sdk=#{MacOS.sdk_path}
+ EOS
# fixed usage of bsdtar with unsupported parameters (replaced with gnu-tar)
inreplace "toolkit/mozapps/installer/packager.mk", "$(TAR) -c --owner=0 --group=0 --numeric-owner",
"#{Formula["gnu-tar"].bin}/gtar -c --owner=0 --group=0 --numeric-owner"
+ # nss is not fully parallel build safe (fixes rare ld: library not found for -lplc4 issues)
+ ENV.deparallelize
system "make", "-f", "client.mk", "build"
system "make", "-f", "client.mk", "package"
@@ -99,10 +103,8 @@ def install
if build.head?
# update HEAD version here with every version bump
tar_path = "objdir/dist/xulrunner-30.0a1.en-US.mac64.tar.bz2"
- elsif build.devel?
- tar_path = "objdir/dist/xulrunner-#{version.to_s[/\d+.\d/]}.en-US.mac64.tar.bz2"
else
- tar_path = "objdir/dist/xulrunner-#{version}.en-US.mac64.tar.bz2"
+ tar_path = "objdir/dist/xulrunner-#{version.to_s[/\d+\.\d+(\.\d+)?/]}.en-US.mac64.tar.bz2"
@adamv Owner
adamv added a note

Can this be hardcoded instead of matched?

yes, but then is has to be updated with every stable/devel update (this removes the b6 part from the devel fersion number)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
end
system "tar", "-xvj", "-C", frameworks, "-f", tar_path
Something went wrong with that request. Please try again.