From 6814fe910ccdc3dfa4b5d53cfd223e345ea0e865 Mon Sep 17 00:00:00 2001 From: Hector Zhao Date: Tue, 27 Jan 2015 23:07:12 +0800 Subject: nss: add nss-config (required by xulrunner etc.) Similar to #9705, some configure scripts (firefox, xulrunner etc.) check for nss via nss-config, which is not available upstream. GNU/Linux distros ship their own variants of nss-config, e.g. Debian: http://anonscm.debian.org/cgit/pkg-mozilla/nss.git/tree/debian/nss-config.in Fedora: http://pkgs.fedoraproject.org/cgit/nss.git/tree/nss-config.in Gentoo: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch?view=markup The one in this pr is a read only wrapper around pkg-config which supports only "--version", "--cflags" & "--libs". Closes #36315. Signed-off-by: Mike McQuaid --- Library/Formula/nss.rb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/nss.rb b/Library/Formula/nss.rb index bbd100963..763def5f0 100644 --- a/Library/Formula/nss.rb +++ b/Library/Formula/nss.rb @@ -4,12 +4,9 @@ class Nss < Formula homepage "https://developer.mozilla.org/docs/NSS" url "https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/nss-3.17.4.tar.gz" sha256 "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79" + revision 1 bottle do - cellar :any - sha1 "889e6e9b0fca634d3a8a33178db763067520d6a7" => :yosemite - sha1 "f850ef686c6437b4b690caa577ed1f8716a44303" => :mavericks - sha1 "bc980cf76bf8f6c2b7cd0d34fa9cca02bb1c342b" => :mountain_lion end depends_on "nspr" @@ -57,6 +54,7 @@ class Nss < Formula # resolves conflict with openssl, see #28258 rm lib/"libssl.a" + (bin+"nss-config").write config_file (lib+"pkgconfig/nss.pc").write pc_file end @@ -67,8 +65,22 @@ class Nss < Formula system "#{bin}/certutil", "-L", "-d", pwd end + # A very minimal nss-config for configuring firefox etc. with this nss, + # see https://bugzil.la/530672 for the progress of upstream inclusion. + def config_file; <<-EOS.undent + #!/bin/sh + for opt; do :; done + case "$opt" in + --version) opt="--modversion";; + --cflags|--libs) ;; + *) exit 1;; + esac + pkg-config "$opt" nss + EOS + end + def pc_file; <<-EOS.undent - prefix=#{opt_prefix} + prefix=#{prefix} exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include/nss @@ -76,7 +88,7 @@ class Nss < Formula Name: NSS Description: Mozilla Network Security Services Version: #{version} - Requires: nspr + Requires: nspr >= 4.10.7 Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 Cflags: -I${includedir} EOS -- cgit v1.2.3