diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2015-12-20 21:11:14 +0900 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-12-21 16:22:03 +0000 |
| commit | 7f05b452bf755f9d6dcffcc50f2baf1f62b4a5cd (patch) | |
| tree | 22dacdda306f2495a66f9f27d0c9a9fb967624af | |
| parent | 02b5f1961e25d29fce43bd084425d1dc16f368d4 (diff) | |
| download | infrastructure-7f05b452bf755f9d6dcffcc50f2baf1f62b4a5cd.tar.gz | |
Upgrading mozilla nss to nss-3.21
This is required to build recent evolution
It's also just required, current nss is getting old.
New build approach follows LFS instructions here:
http://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
Change-Id: I41645d98a18764b7356a019c44cc62c8f1cfdf2b
| -rw-r--r-- | strata/network-security.morph | 4 | ||||
| -rw-r--r-- | strata/network-security/nss.morph | 33 |
2 files changed, 31 insertions, 6 deletions
diff --git a/strata/network-security.morph b/strata/network-security.morph index 0d8c54d3..cf1fd1dc 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -11,7 +11,7 @@ chunks: - name: nss morph: strata/network-security/nss.morph repo: upstream:nss - ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487 - unpetrify-ref: baserock/morph + ref: 8810dc4b4b559efec957bdab67decbc701cba7a1 + unpetrify-ref: baserock/nss-3.21 build-depends: - nspr diff --git a/strata/network-security/nss.morph b/strata/network-security/nss.morph index bc50df8c..2103622c 100644 --- a/strata/network-security/nss.morph +++ b/strata/network-security/nss.morph @@ -1,7 +1,32 @@ name: nss kind: chunk max-jobs: 1 -build-system: autotools -configure-commands: -- NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="$PREFIX/lib" +build-system: manual +build-commands: +- | + case "$MORPH_ARCH" in + x86_64|ppc64) + export USE_64=1;; + *) + ;; + esac + cd nss + make BUILD_OPT=1 \ + NSPR_INCLUDE_DIR=/usr/include/nspr \ + USE_SYSTEM_ZLIB=1 \ + ZLIB_LIBS=-lz \ + NSS_USE_SYSTEM_SQLITE=1 +install-commands: +- install -d "$DESTDIR"/usr/lib/pkgconfig +- install -v -m755 dist/Linux*/lib/*.so "$DESTDIR"/usr/lib +- install -v -m644 dist/Linux*/lib/*.chk "$DESTDIR"/usr/lib +- install -v -m644 dist/Linux*/lib/libcrmf.a "$DESTDIR"/usr/lib +- install -v -m755 -d "$DESTDIR"/usr/include/nss +- cp -v -RL dist/public/nss/* "$DESTDIR"/usr/include/nss +- cp -v -RL dist/private/nss/* "$DESTDIR"/usr/include/nss +- chmod -v 644 "$DESTDIR"/usr/include/nss/* +- install -d "$DESTDIR"/usr/bin +- install -v -m755 dist/Linux*/bin/certutil "$DESTDIR"/usr/bin +- install -v -m755 dist/Linux*/bin/nss-config "$DESTDIR"/usr/bin +- install -v -m755 dist/Linux*/bin/pk12util "$DESTDIR"/usr/bin +- install -v -m644 dist/Linux*/lib/pkgconfig/nss.pc "$DESTDIR"/usr/lib/pkgconfig |