From 682b4ba85c22ab9862304cb883a7234373e3f893 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 3 Jul 2012 17:52:57 -0400 Subject: 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. --- recipe.d/0023-nss-util | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'recipe.d/0023-nss-util') diff --git a/recipe.d/0023-nss-util b/recipe.d/0023-nss-util index 1c546d5..aeaafba 100644 --- a/recipe.d/0023-nss-util +++ b/recipe.d/0023-nss-util @@ -1,6 +1,5 @@ -######################################################## -# needs perl -######################################################## +#requires nspr +#requires perl mcd $BUILDDIR/nss @@ -23,18 +22,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-util-3.*/mozilla/security/coreconf +make -C $SRC/nss-util-3.*/mozilla/security/dbm +make -C $SRC/nss-util-3.*/mozilla/security/nss -cd $SRC/${1}-3.*/mozilla/security/coreconf +cd $SRC/nss-util-3.*/mozilla/security/coreconf make install -cd $SRC/${1}-3.*/mozilla/security/dbm +cd $SRC/nss-util-3.*/mozilla/security/dbm make install -cd $SRC/${1}-3.*/mozilla/security/nss +cd $SRC/nss-util-3.*/mozilla/security/nss make install # Copy the binary libraries we want -cd $SRC/${1}-3.* +cd $SRC/nss-util-3.* for file in `cd mozilla/dist/*.OBJ/lib; echo *` do -- cgit