summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Bo ├śrsted Andresen <zlin@exherbo.org> 2009-11-01 08:08:10 +0000
committerAvatar Bo ├śrsted Andresen <zlin@exherbo.org> 2009-11-03 07:55:14 +0000
commit01a868947cc8f7dc08387add6618544f0494b014 (patch)
tree8a9f8bb25a924bbd608f7871bea200ae85b6582f
parent0dfad79a07d3f069c4610360d145a05f7b77f16e (diff)
downloadmozilla-01a868947cc8f7dc08387add6618544f0494b014.tar.gz
mozilla-01a868947cc8f7dc08387add6618544f0494b014.tar.xz
Style.
-rw-r--r--packages/dev-libs/nss/nss-3.12.3.1-r1.exheres-017
1 files changed, 8 insertions, 9 deletions
diff --git a/packages/dev-libs/nss/nss-3.12.3.1-r1.exheres-0 b/packages/dev-libs/nss/nss-3.12.3.1-r1.exheres-0
index 7a2af2a..f01d9ce 100644
--- a/packages/dev-libs/nss/nss-3.12.3.1-r1.exheres-0
+++ b/packages/dev-libs/nss/nss-3.12.3.1-r1.exheres-0
@@ -35,8 +35,7 @@ WORK="${WORKBASE}/${PNV}/mozilla/security/nss"
src_configure() {
# Respect LDFLAGS
export DSO_LDOPTS="${LDFLAGS}"
- option platform:amd64 && export USE_64=1
- option platform:ppc64 && export USE_64=1
+ option platform:amd64 || option platform:ppc64 && export USE_64=1
}
src_compile() {
@@ -53,8 +52,8 @@ src_compile() {
}
src_test_expensive() {
- cd tests || die "Entering tests failed"
- ./all.sh || die "Tests failed"
+ edo cd tests
+ edo ./all.sh
}
src_install() {
@@ -63,10 +62,10 @@ src_install() {
local ${v}=$(sed -n "s/^#define[[:space:]]*NSS_V${v}[[:space:]]*//p" lib/nss/nss.h)
done
- sed -e "s|@LIBDIR@|$(get_libdir)|" \
- -e "s|@MAJOR_VERSION@|${MAJOR}|" \
- -e "s|@VERSION@|${MAJOR}.${MINOR}.${PATCH}|" \
- "${FILES}"/nss.pc.in > "${WORK}"/nss.pc
+ edo sed -e "s|@LIBDIR@|$(get_libdir)|" \
+ -e "s|@MAJOR_VERSION@|${MAJOR}|" \
+ -e "s|@VERSION@|${MAJOR}.${MINOR}.${PATCH}|" \
+ "${FILES}"/nss.pc.in > "${WORK}"/nss.pc
insinto /usr/lib/pkgconfig
doins "${WORK}"/nss.pc
@@ -77,7 +76,7 @@ src_install() {
LDPATH="/usr/$(get_libdir)/nss"
EOF
- cd ../../dist || die "Entering dist/ failed"
+ edo cd ../../dist
insinto /usr/$(get_libdir)/nss
doins *.OBJ/lib/*.{chk,a}