summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranziskus Kiefer2017-06-12 15:54:29 +0200
committerFranziskus Kiefer2017-06-12 15:54:29 +0200
commitcae7e807fe62f2c33c5a62a25da0896d182a3c3a (patch)
tree6c8d68067ac1f5a154fbe0a542b91534e67e76c2
parent256dd18125dbc2cd5db456203034f3269698084c (diff)
downloadaur-cae7e807fe62f2c33c5a62a25da0896d182a3c3a.tar.gz
use system gyp
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD29
2 files changed, 11 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1adf94f67e6..5591234428c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = nss-hg
pkgdesc = Mozilla Network Security Services
- pkgver = r13423.431af1a9435a
+ pkgver = r13438.8cd50ae99b50
pkgrel = 1
url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
arch = i686
arch = x86_64
license = MPL
license = GPL
+ makedepends = gyp
makedepends = perl
makedepends = python2
makedepends = ninja
@@ -15,7 +16,7 @@ pkgbase = nss-hg
makedepends = mercurial
makedepends = python2-setuptools
makedepends = python2-virtualenv
- depends = nspr>=4.13
+ depends = nspr>=4.15
depends = sqlite
depends = zlib
depends = sh
diff --git a/PKGBUILD b/PKGBUILD
index f2940087671..93e6eadb95e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,15 @@
_pkgname=nss
pkgname=nss-hg
-pkgver=r13423.431af1a9435a
+pkgver=r13438.8cd50ae99b50
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
license=('MPL' 'GPL')
-_nsprver=4.13
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
-makedepends=('perl' 'python2' 'ninja' 'git' 'python2' 'mercurial' 'python2-setuptools' 'python2-virtualenv')
+_nsprver=4.15
+depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
+makedepends=(gyp perl python2 ninja git python2 mercurial python2-setuptools python2-virtualenv)
options=('!strip' '!makeflags' 'staticlibs')
source=("hg+https://hg.mozilla.org/projects/nss")
sha256sums=('SKIP')
@@ -24,25 +24,12 @@ pkgver() {
printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
}
-prepare() {
- if [ ! -d gyp ]; then
- git clone https://chromium.googlesource.com/external/gyp
- fi
- python2 -m virtualenv python-env
- cd gyp
- ../python-env/bin/python setup.py install
- cd ../nss
- hg up default
-}
-
build() {
- if [ ! -f python ]; then
- ln -s /usr/bin/python2 python
- fi
cd nss
- PATH=$PWD/../python-env/bin/:$PWD/../:$PATH ./build.sh --opt --system-sqlite \
- --system-nspr \
- --disable-tests
+ hg up default
+ PATH=:$PWD/../:$PATH ./build.sh --opt --system-sqlite \
+ --system-nspr \
+ --disable-tests
}
package() {