sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (3a07b7dc32d74968b78155c033ade805aefae601)
- From: Arwed von Merkatz <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (3a07b7dc32d74968b78155c033ade805aefae601)
- Date: Mon, 19 Apr 2010 09:47:08 -0500
GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:
crypto/nss/BUILD | 2 +-
crypto/nss/HISTORY | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 3a07b7dc32d74968b78155c033ade805aefae601
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
nss: fixed BUILD to work for DEFAULT branch, bug 15680
diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index d037513..7a287c0 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -13,7 +13,7 @@ cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk &&
-if [[ $NSS_BRANCH != 3.12 ]]; then
+if [[ $NSS_BRANCH == 3.11 ]]; then
sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk
fi &&
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index fefab15..cfdd68e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2010-04-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: fixed location.mk sedit to only apply to 3.11, not DEFAULT
+ branch, fixes bug #15680
+
2010-03-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PRE_BUILD, BUILD, INSTALL: used official nss tarball
- [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (3a07b7dc32d74968b78155c033ade805aefae601), Arwed von Merkatz, 04/19/2010
Archive powered by MHonArc 2.6.24.