diff options
| author | Al Stone <ahs3@redhat.com> | 2012-12-22 10:10:32 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2012-12-22 10:10:32 -0700 |
| commit | 51c4c00a8c65d80678da828fc73ae635601b4046 (patch) | |
| tree | af20f1d89e64b2428fa046d24276049e95af05e5 | |
| parent | 6035f11251e0fb6f393b28d960bb3be230c2abf5 (diff) | |
| parent | a9a737396e9177e66c0d5ec9416398dfb99586d7 (diff) | |
| download | bootstrap.git.DONOTUSE-51c4c00a8c65d80678da828fc73ae635601b4046.tar.gz bootstrap.git.DONOTUSE-51c4c00a8c65d80678da828fc73ae635601b4046.tar.xz bootstrap.git.DONOTUSE-51c4c00a8c65d80678da828fc73ae635601b4046.zip | |
Merge branch 'aarch64-ahs3'
| -rw-r--r-- | recipe.d/0023-nss-util | 6 | ||||
| -rwxr-xr-x | stage1 | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/recipe.d/0023-nss-util b/recipe.d/0023-nss-util index 1d7b586..2375881 100644 --- a/recipe.d/0023-nss-util +++ b/recipe.d/0023-nss-util @@ -22,6 +22,12 @@ export FREEBL_NO_DEPEND NSS_USE_SYSTEM_SQLITE=1 export NSS_USE_SYSTEM_SQLITE +if [ "$SUFFIX" = "64" ] +then + USE_64=1 + export USE_64 +fi + 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 @@ -1091,10 +1091,15 @@ EOF cp $STAGE2 $ROOTFS/stage2/stage2 ( - newJ=$(echo $J | sed 's/-j//') - echo J=-j$newJ + # BOZO: temporary fix for network issues in models + #newJ=$(echo $J | sed 's/-j//') + #echo J=-j$newJ + + #echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 + echo J=1 + echo DISTCC_HOSTS=localhost + # END BOZO - echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 echo DISTCC_BACKOFF_PERIOD=0 echo PATH=/stage2/distcc-bin:\$PATH |