summaryrefslogtreecommitdiffstats
path: root/recipe.d/0024-nss-softokn
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2012-07-03 17:52:57 -0400
committerDJ Delorie <dj@delorie.com>2012-07-03 17:52:57 -0400
commit682b4ba85c22ab9862304cb883a7234373e3f893 (patch)
treec8f5f090dbe0e324d377c629a8f6361db4fd68cd /recipe.d/0024-nss-softokn
parent3d5366a613c9b6b5f76dd091c1b4b46ca3d5710e (diff)
downloadbootstrap.git.DONOTUSE-682b4ba85c22ab9862304cb883a7234373e3f893.tar.gz
bootstrap.git.DONOTUSE-682b4ba85c22ab9862304cb883a7234373e3f893.tar.xz
bootstrap.git.DONOTUSE-682b4ba85c22ab9862304cb883a7234373e3f893.zip
script->make, ccache move
Convert build iteration logic (stage 2) from list driven to Makefile driven. Add actual dependencies to recipe files and use them to control build sequence. ccache is moved to stage1 and configured to be used in stage2.
Diffstat (limited to 'recipe.d/0024-nss-softokn')
-rw-r--r--recipe.d/0024-nss-softokn21
1 files changed, 11 insertions, 10 deletions
diff --git a/recipe.d/0024-nss-softokn b/recipe.d/0024-nss-softokn
index 2df15e6..7dfc548 100644
--- a/recipe.d/0024-nss-softokn
+++ b/recipe.d/0024-nss-softokn
@@ -1,6 +1,7 @@
-########################################################
-# needs perl
-########################################################
+#requires nspr
+#requires perl
+#requires pkgconfig
+#requires nss-util
mcd $BUILDDIR/nss
@@ -28,18 +29,18 @@ export FREEBL_NO_DEPEND
NSS_USE_SYSTEM_SQLITE=1
export NSS_USE_SYSTEM_SQLITE
-make -C $SRC/${1}-3.*/mozilla/security/coreconf
-make -C $SRC/${1}-3.*/mozilla/security/dbm
-make -C $SRC/${1}-3.*/mozilla/security/nss
+make -C $SRC/nss-softokn-3.*/mozilla/security/coreconf
+make -C $SRC/nss-softokn-3.*/mozilla/security/dbm
+make -C $SRC/nss-softokn-3.*/mozilla/security/nss
-cd $SRC/${1}-3.*/mozilla/security/coreconf
+cd $SRC/nss-softokn-3.*/mozilla/security/coreconf
make install
-cd $SRC/${1}-3.*/mozilla/security/dbm
+cd $SRC/nss-softokn-3.*/mozilla/security/dbm
make install
-cd $SRC/${1}-3.*/mozilla/security/nss
+cd $SRC/nss-softokn-3.*/mozilla/security/nss
make install
# Copy the binary libraries we want
-cd $SRC/${1}-3.*
+cd $SRC/nss-softokn-3.*
for file in `cd mozilla/dist/*.OBJ/lib; echo *`
do