diff options
| author | Al Stone <ahs3@redhat.com> | 2012-12-27 18:35:47 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2012-12-27 18:35:47 -0700 |
| commit | dc267522929727f49236baabd8b2160083f12623 (patch) | |
| tree | 2696900b7db257593a69b54a8d76076c2300ea18 | |
| parent | 51c4c00a8c65d80678da828fc73ae635601b4046 (diff) | |
| parent | ce9f986e017024f6eb7b9943953cdb7bc6a681e2 (diff) | |
| download | bootstrap.git.DONOTUSE-dc267522929727f49236baabd8b2160083f12623.tar.gz bootstrap.git.DONOTUSE-dc267522929727f49236baabd8b2160083f12623.tar.xz bootstrap.git.DONOTUSE-dc267522929727f49236baabd8b2160083f12623.zip | |
Merge branch 'aarch64-ahs3'
| -rw-r--r-- | recipe.d/0024-nss-softokn | 25 | ||||
| -rw-r--r-- | recipe.d/0025-nss | 6 |
2 files changed, 31 insertions, 0 deletions
diff --git a/recipe.d/0024-nss-softokn b/recipe.d/0024-nss-softokn index aacb85c..cebed68 100644 --- a/recipe.d/0024-nss-softokn +++ b/recipe.d/0024-nss-softokn @@ -29,6 +29,31 @@ 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 + +# publish some header files from NSS to eliminate a +# circular dependency -- these will be replaced when +# the nss package gets built +[ ! -d /usr/include/nss3 ] && mkdir /usr/include/nss3 +for ii in cryptohi/cryptohi.h cryptohi/cryptoht.h \ + cryptohi/key.h cryptohi/keyhi.h cryptohi/keythi.h cryptohi/keyt.h \ + certdb/certt.h certdb/cert.h certdb/certdb.h \ + freebl/blapit.h freebl/hasht.h \ + freebl/ecl/ecl-exp.h \ + pk11wrap/secpkcs5.h pk11wrap/pk11func.h pk11wrap/pk11pub.h \ + pk11wrap/pk11priv.h \ + pkcs7/secpkcs7.h pkcs7/pkcs7t.h \ + softoken/secmodt.h \ + smime/cmsreclist.h \ + ssl/sslerr.h ssl/sslt.h ssl/ssl.h ssl/sslproto.h +do + cp $SRC/nss-3.*/mozilla/security/nss/lib/$ii /usr/include/nss3 +done + 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 diff --git a/recipe.d/0025-nss b/recipe.d/0025-nss index c57edcc..4709d29 100644 --- a/recipe.d/0025-nss +++ b/recipe.d/0025-nss @@ -21,6 +21,12 @@ FREEBL_LIB_DIR=/usr/lib${SUFFIX} export FREEBL_LIB_DIR + if [ "$SUFFIX" = "64" ] + then + USE_64=1 + export USE_64 + fi + make -C $SRC/nss-3.*/mozilla/security/coreconf make -C $SRC/nss-3.*/mozilla/security/dbm make -C $SRC/nss-3.*/mozilla/security/nss |