Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (bb0d130ec262dd599a0176881533a133e7f484cb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (bb0d130ec262dd599a0176881533a133e7f484cb)
  • Date: Sat, 11 Nov 2006 18:52:29 -0600

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

crypto/nss/BUILD | 11 ++++++++---
crypto/nss/HISTORY | 4 ++++
crypto/nss/INSTALL | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit bb0d130ec262dd599a0176881533a133e7f484cb
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

nss fixed for x86_64 needs the USE_64=1 flag to work

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 3179de0..55120bb 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -9,14 +9,19 @@ export SOURCE_PREFIX=$(pwd) &&
#find nss/lib -name Makefile | while read __MAKEFILE; do
# sedit 's#$(DIST)/lib/$(LIB_PREFIX)\(plc4\|plds4\)\.$(LIB_SUFFIX)#-l\1#g'
$__MAKEFILE
#done &&
+persistent_add MAKE_OPTS &&
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
+then
+ MAKE_OPTS="USE_64=1"
+fi &&

echo "INCLUDES += -I${ROOT}/usr/include/nspr" >>
$SOURCE_DIRECTORY/mozilla/security/coreconf/headers.mk &&

cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
-make &&
+make $MAKE_OPTS &&

cd $SOURCE_DIRECTORY/mozilla/security/dbm &&
-make &&
+make $MAKE_OPTS &&

cd $SOURCE_DIRECTORY/mozilla/security/nss &&
-make
+make $MAKE_OPTS
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 55d5ef8..1f65a9f 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2006-11-11 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: fixed x86_64 you have to specify USE_64=1 for it to build
64bit
+ * INSTALL: same for installing with 64bit
+
2006-11-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.11.3, removed SOURCE2 (dbm is included)
* BUILD: adapted to new version
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 0b8ed1d..65313db 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,7 +1,7 @@
### cheating to get them all in one place
cd $SOURCE_DIRECTORY/mozilla/security/nss &&
make_normal &&
-make install &&
+make $MAKE_OPTS install &&

# copy NSS configuration info
install --mode=644 $SCRIPT_DIRECTORY/mozilla-nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig/ &&



  • [SM-Commit] GIT changes to master grimoire by David Brown (bb0d130ec262dd599a0176881533a133e7f484cb), David Brown, 11/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page